diff --git a/.cvsignore b/.cvsignore
index 9291b86..bbb78ba 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-matplotlib-0.87.6.tar.gz
+matplotlib-0.87.7.tar.gz
diff --git a/matplotlib-0.87-matplotlibrc.patch b/matplotlib-0.87-matplotlibrc.patch
deleted file mode 100644
index dba47ac..0000000
--- a/matplotlib-0.87-matplotlibrc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- matplotlib-0.87/setup.py.orig	2006-02-14 11:11:32.000000000 -0700
-+++ matplotlib-0.87/setup.py	2006-02-27 15:19:28.000000000 -0700
-@@ -258,8 +258,8 @@
- 
- # packagers: set rc['numerix'] and rc['backend'] here to override the auto
- # defaults, eg
--#rc['numerix'] = numpy
--#rc['backend'] = GTKAgg
-+rc['numerix'] = 'Numeric'
-+rc['backend'] = 'GTKAgg'
- if sys.platform=='win32':
-     rc = dict(backend='TkAgg', numerix='Numeric')
- template = file('matplotlibrc.template').read()
diff --git a/matplotlib-0.87.7-matplotlibrc.patch b/matplotlib-0.87.7-matplotlibrc.patch
new file mode 100644
index 0000000..a172ebe
--- /dev/null
+++ b/matplotlib-0.87.7-matplotlibrc.patch
@@ -0,0 +1,13 @@
+--- matplotlib-0.87/setup.py.orig	2006-02-14 11:11:32.000000000 -0700
++++ matplotlib-0.87/setup.py	2006-02-27 15:19:28.000000000 -0700
+@@ -258,8 +258,8 @@
+ 
+ # packagers: set rc['numerix'] and rc['backend'] here to override the auto
+ # defaults, eg
+-#rc['numerix'] = numpy
+-#rc['backend'] = GTKAgg
++rc['numerix'] = 'numpy'
++rc['backend'] = 'GTKAgg'
+ if sys.platform=='win32':
+     rc = dict(backend='TkAgg', numerix='Numeric')
+ template = file('matplotlibrc.template').read()
diff --git a/matplotlib-0.87.7-tkagg-check.patch b/matplotlib-0.87.7-tkagg-check.patch
new file mode 100644
index 0000000..b07b4be
--- /dev/null
+++ b/matplotlib-0.87.7-tkagg-check.patch
@@ -0,0 +1,22 @@
+--- matplotlib-0.87.7/setup.py.fix	2006-11-20 19:49:56.000000000 -0900
++++ matplotlib-0.87.7/setup.py	2006-11-20 19:51:03.000000000 -0900
+@@ -251,16 +251,9 @@
+         print 'Tkinter present but import failed'
+         BUILD_TKAGG = 0
+     else:
+-        try:
+-            tk = Tkinter.Tk()
+-            tk.withdraw()
+-        except Tkinter.TclError:
+-            print 'Tkinter present, but window failed to open'
+-            BUILD_TKAGG = 0
+-        else:
+-            BUILD_AGG = 1
+-            build_tkagg(ext_modules, packages, NUMERIX)
+-            rc['backend'] = 'TkAgg'
++        BUILD_AGG = 1
++        build_tkagg(ext_modules, packages, NUMERIX)
++        rc['backend'] = 'TkAgg'
+ 
+ if BUILD_WXAGG:
+     try:
diff --git a/python-matplotlib.spec b/python-matplotlib.spec
index 5cfd663..2c3449b 100644
--- a/python-matplotlib.spec
+++ b/python-matplotlib.spec
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-matplotlib
-Version:        0.87.6
+Version:        0.87.7
 Release:        1%{?dist}
 Summary:        Python plotting library
 
@@ -9,7 +9,8 @@ Group:          Development/Libraries
 License:        Python Software Foundation License 
 URL:            http://sourceforge.net/projects/matplotlib
 Source0:        http://dl.sf.net/matplotlib/matplotlib-%{version}.tar.gz
-Patch0:         matplotlib-0.87-matplotlibrc.patch
+Patch0:         matplotlib-0.87.7-matplotlibrc.patch
+Patch1:         matplotlib-0.87.7-tkagg-check.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel, freetype-devel, libpng-devel, zlib-devel
@@ -38,7 +39,8 @@ Requires:       tkinter
 
 %prep
 %setup -q -n matplotlib-%{version}
-%patch -p1 -b .matplotlibrc
+%patch0 -p1 -b .matplotlibrc
+%patch1 -p1 -b setup.py 
 chmod -x images/*.svg
 
 %build
@@ -71,6 +73,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Nov  21 2006 Orion Poplawski <orion@cora.nwra.com> 0.87.7-1
+- Update to 0.87.7 and fix up the defaults to use numpy
+- Force build of tkagg backend without X server
+- Use src.rpm from Jef Spaleta, closes bug 216578
+
 * Fri Oct  6 2006 Orion Poplawski <orion@cora.nwra.com> 0.87.6-1
 - Update to 0.87.6
 
diff --git a/sources b/sources
index c6bd3ca..ac7a0f0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-30c30e10d2338c56ae5b31f0adf325f5  matplotlib-0.87.6.tar.gz
+cca3d3a644c1a84d6dcf4af8a9856b7b  matplotlib-0.87.7.tar.gz