diff --git a/python-matplotlib.spec b/python-matplotlib.spec
index e910c98..ff6106d 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.86
+Version:        0.87
 Release:        1%{?dist}
 Summary:        Python plotting library
 
@@ -9,21 +9,35 @@ 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel, freetype-devel, libpng-devel, zlib-devel
-BuildRequires:  pygtk2-devel, gtk2-devel
-BuildRequires:  python-numeric, pytz, python-dateutil
+BuildRequires:  pygtk2-devel, gtk2-devel, tkinter, tk-devel
+BuildRequires:  python-numeric, pytz, python-dateutil, numpy, python-numarray
 Requires:       python-numeric, pytz, python-dateutil
 
+
 %description
 Matplotlib is a pure python plotting library with the goal of making
 publication quality plots using a syntax familiar to matlab users. The
 library uses Numeric for handling large data sets and supports a variety
 of output backends
 
+
+%package        tk
+Summary:        Tk backend for python-matplotlib
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       tkinter
+
+%description    tk
+%{summary}
+
+
 %prep
 %setup -q -n matplotlib-%{version}
+%patch -p1 -b .matplotlibrc
 chmod -x images/*.svg
 
 %build
@@ -43,10 +57,45 @@ rm -rf $RPM_BUILD_ROOT
 %doc license/LICENSE_PAINT license/LICENSE_PIL
 %doc API_CHANGES CHANGELOG CXX INSTALL INTERACTIVE KNOWN_BUGS
 %doc NUMARRAY_ISSUES PKG-INFO TODO
-%{python_sitearch}/matplotlib/
-%{python_sitearch}/pylab.py*
+%dir %{python_sitearch}/matplotlib
+%{python_sitearch}/matplotlib/*.py
+%{python_sitearch}/matplotlib/*.pyc
+%ghost %{python_sitearch}/matplotlib/*.pyo
+%{python_sitearch}/matplotlib/*.so
+%dir %{python_sitearch}/matplotlib/backends
+%{python_sitearch}/matplotlib/backends/*.py
+%{python_sitearch}/matplotlib/backends/*.pyc
+%ghost %{python_sitearch}/matplotlib/backends/*.pyo
+%{python_sitearch}/matplotlib/backends/*.so
+%{python_sitearch}/matplotlib/enthought/
+%{python_sitearch}/matplotlib/ft2font.so
+%{python_sitearch}/matplotlib/mpl-data/
+%{python_sitearch}/matplotlib/numerix/
+%{python_sitearch}/matplotlib/toolkits/
+%{python_sitearch}/pylab.py
+%{python_sitearch}/pylab.pyc
+%ghost %{python_sitearch}/pylab.pyo
+%exclude %{python_sitearch}/matplotlib/backends/backend_tkagg.*
+%exclude %{python_sitearch}/matplotlib/backends/tkagg.*
+%exclude %{python_sitearch}/matplotlib/backends/_tkagg.so
+
+%files tk
+%{python_sitearch}/matplotlib/backends/backend_tkagg.py
+%{python_sitearch}/matplotlib/backends/backend_tkagg.pyc
+%{python_sitearch}/matplotlib/backends/tkagg.py
+%{python_sitearch}/matplotlib/backends/tkagg.pyc
+%ghost %{python_sitearch}/matplotlib/backends/backend_tkagg.pyo
+%ghost %{python_sitearch}/matplotlib/backends/tkagg.pyo
+%{python_sitearch}/matplotlib/backends/_tkagg.so
 
 %changelog
+* Fri Feb 24 2006 Orion Poplawski <orion@cora.nwra.com> 0.87-1
+- Update to 0.87
+- Add BR numpy and python-numarray
+- Add patch to keep Numeric as the default numerix package
+- Add BR tkinter and tk-devel for TkInter backend
+- Make separate package for Tk backend
+
 * Tue Jan 10 2006 Orion Poplawski <orion@cora.nwra.com> 0.86-1
 - Update to 0.86