diff --git a/pycairo.spec b/pycairo.spec
index 6120e4c..9964907 100644
--- a/pycairo.spec
+++ b/pycairo.spec
@@ -4,13 +4,13 @@
 
 Name: pycairo
 Version: 1.2.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL
 Group: Development/Languages
 Summary: Python bindings for the cairo library
-URL: http://cairographics.org/
+URL: http://cairographics.org/pycairo
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Source: %{name}-%{version}.tar.gz
+Source: http://cairographics.org/releases/pycairo-%{version}.tar.gz
 
 ### Dependencies ###
 
@@ -18,10 +18,9 @@ Requires: cairo >= 1.2.6
 
 ### Build Dependencies ###
 
-BuildRequires: python
 BuildRequires: cairo-devel 
-BuildRequires: python-devel
 BuildRequires: pkgconfig
+BuildRequires: python-devel
 
 %description
 Python bindings for the cairo library.
@@ -29,41 +28,44 @@ Python bindings for the cairo library.
 %package devel
 Summary: Libraries and headers for pycairo
 Group: Development/Libraries
-Requires: %name = %{version}-%{release}
-Requires: cairo-devel python-devel
+Requires: %{name} = %{version}-%{release}
+Requires: cairo-devel
+Requires: pkgconfig
+Requires: python-devel
 
 %description devel
 This package contains files required to build wrappers for cairo add-on
 libraries so that they interoperate with pycairo.
 
 %prep
-%setup -q
+%setup -q -n pycairo-%{version}
 
 %build
 %configure
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-%makeinstall
-find $RPM_BUILD_ROOT -name '*.la' |xargs rm 
+make DESTDIR=$RPM_BUILD_ROOT install
+find $RPM_BUILD_ROOT -name '*.la' | xargs rm -f
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc
+%doc AUTHORS ChangeLog COPYING* INSTALL NEWS NOTES README
 %{python_sitearch}/cairo/
 
 %files devel
 %defattr(-,root,root,-)
-%dir %{_includedir}/pycairo
+%{_includedir}/pycairo/
 %{_libdir}/pkgconfig/pycairo.pc
-%{_includedir}/pycairo/pycairo.h
 
 %changelog
+* Mon Feb 05 2007 Matthew Barnes <mbarnes@redhat.com> - 1.2.6-3.fc7
+- Incorporate suggestions from package review (RH bug #226329).
+
 * Thu Dec  7 2006 Jeremy Katz <katzj@redhat.com> - 1.2.6-2
 - rebuild against python 2.5