diff --git a/.cvsignore b/.cvsignore
index 0d5ca09..910d00d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 dbus-python-0.70.tar.gz
+dbus-python-0.80.1.tar.gz
diff --git a/dbus-python.spec b/dbus-python.spec
index 64218e4..1fe76b6 100644
--- a/dbus-python.spec
+++ b/dbus-python.spec
@@ -1,40 +1,53 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define pyrex_version 0.9.4-4
 %define dbus_glib_version 0.70
 %define dbus_version 0.90
 
 Summary: D-Bus Python Bindings 
 Name: dbus-python
-Version: 0.70
-Release: 9%{?dist}
+Version: 0.80.1
+Release: 1%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz
-Patch0: dbus-python-0.70-fix-binary-modules-dir.patch
+
 License: AFL/GPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
-BuildRequires: Pyrex >= %{pyrex_version}
-Requires: libxml2-python
 
 %description
 
 D-Bus python bindings for use with python programs.   
 
+%package devel
+Summary: Libraries and headers for dbus-python
+Group: Development/Libraries
+Requires: %name = %{version}-%{release}
+
+%description devel
+
+Headers and static libraries for hooking up custom mainloops to the dbus python
+bindings.
+
 %prep
 %setup -q
-%patch0 -p1 -b .fix-binary-modules-dir
 
 %build
+%configure
+
+make
 
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+#CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
 %install
 rm -rf %{buildroot}
 
-PKG_CONFIG_PATH=%{_libdir}/pkgconfig %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+#PKG_CONFIG_PATH=%{_libdir}/pkgconfig %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+
+rm -f $RPM_BUILD_ROOT/%{python_sitearch}/*.la
 
 %clean
 rm -rf %{buildroot}
@@ -42,12 +55,36 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 
-%doc COPYING ChangeLog NEWS
-
-%{python_sitearch}/dbus/*.so
+%doc COPYING ChangeLog
+%docdir /usr/share/doc/dbus-python
+%{_docdir}/dbus-python/API_CHANGES.txt
+%{_docdir}/dbus-python/HACKING.txt
+%{_docdir}/dbus-python/NEWS
+%{_docdir}/dbus-python/README
+%{_docdir}/dbus-python/TODO
+%{_docdir}/dbus-python/tutorial.txt
+
+%dir %{python_sitearch}/dbus
+%dir %{python_sitearch}/dbus/mainloop
+%{python_sitearch}/*.so
+%{python_sitearch}/*.py*
 %{python_sitearch}/dbus/*.py*
+%{python_sitearch}/dbus/mainloop/*.py*
+
+%files devel
+%defattr(-,root,root)
+
+%{_includedir}/dbus-1.0/dbus/dbus-python.h
+%{_libdir}/pkgconfig/dbus-python.pc
 
 %changelog
+* Wed Jan 24 2007 John (J5) Palmieri <johnp@redhat.com> - 0.80.1-1
+- upgrade to 0.80.1
+- remove dependency on Pyrex and libxml2
+- some API breakage, 
+  please see http://dbus.freedesktop.org/doc/dbus-python/NEWS.html
+  for notes on changes 
+
 * Wed Jan  3 2007 David Zeuthen <davidz@redhat.com> - 0.70-9%{?dist}
 - rebuild against new Pyrex
 
diff --git a/sources b/sources
index 07215d6..bc61252 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-26a680134801aa9d8dc77ccde7928927  dbus-python-0.70.tar.gz
+42dced5c87a47589ea0b6535ae2e4918  dbus-python-0.80.1.tar.gz