diff --git a/pygobject2.spec b/pygobject2.spec
index 6dbf6c5..db8468d 100644
--- a/pygobject2.spec
+++ b/pygobject2.spec
@@ -1,36 +1,42 @@
-%define pyver %(python -c 'import sys ; print sys.version[:3]')
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_pytho\n_lib()")}
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+### Abstract ###
 
-Summary: Python bindings for gobjects
 Name: pygobject2
 Version: 2.12.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: Development/Languages
-URL: ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.10/
+Summary: Python bindings for GObject
+URL: http://www.pygtk.org/
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Source: pygobject-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+
+### Dependencies ###
+
 Requires: glib2 >= 2.8
 Requires: python2 >= 2.3.5
-Buildrequires: python2-devel >= 2.3.5
-Buildrequires: glib2-devel >= 2.8
-# needed for automake/autoconf to work right with multilib python
+
+### Build Dependencies ###
+
 Buildrequires: automake >= 1.6.3-5
+Buildrequires: glib2-devel >= 2.8
 Buildrequires: libtool
+Buildrequires: python2-devel >= 2.3.5
 
 %description
-Pygobjects is an extension module for python that gives you access to GLib's 
-GObjects
+pygobject2 provides a convenient wrapper for the GObject library
+for use in Python programs.
 
 %package devel
-Summary: files needed to build addon gobject libraries such as pygtk
+Summary: Development files for building add-on libraries
 Group: Development/Languages
 Requires: pygobject2 = %{version}
 Requires: pkgconfig
 
 %description devel
-This package contains files required to build wrappers for gobject addon
-libraries such as pygtk
+This package contains files required to build wrappers for GObject-based
+libraries such as pygtk.
 
 %prep
 %setup -q -n pygobject-%{version}
@@ -56,12 +62,12 @@ rm -fr $RPM_BUILD_ROOT
 %doc AUTHORS NEWS README ChangeLog
 %doc examples
 
-%dir %{_libdir}/python%{pyver}/site-packages/gtk-2.0
-%{_libdir}/python%{pyver}/site-packages/gtk-2.0/dsextras.py*
-%{_libdir}/python%{pyver}/site-packages/pygtk*
+%dir %{python_sitelib}/gtk-2.0
+%{python_sitelib}/gtk-2.0/dsextras.py*
+%{python_sitelib}/pygtk*
 
 %defattr(755, root, root, 755)
-%{_libdir}/python?.?/site-packages/gtk-2.0/gobject
+%{python_sitelib}/gtk-2.0/gobject
 
 %files devel
 %defattr(644, root, root, 755)
@@ -72,6 +78,9 @@ rm -fr $RPM_BUILD_ROOT
 %{_datadir}/pygobject
 
 %changelog
+* Fri Sep 22 2006 Matthew Barnes <mbarnes@redhat.com> - 2.12.1-2.fc6
+- Spec file cleanups.
+
 * Tue Sep  5 2006 Matthias Clasen <mclasen@redhat.com> - 2.12.1-1.fc6
 - Update to 2.12.1
 - Require pkgconfig for the -devel package