diff --git a/.cvsignore b/.cvsignore
index 6579380..d06c974 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-pygobject-2.14.2.tar.bz2
+pygobject-2.15.1.tar.bz2
diff --git a/pygobject-2.12.3-memory-leak.patch b/pygobject-2.12.3-memory-leak.patch
deleted file mode 100644
index 38556f2..0000000
--- a/pygobject-2.12.3-memory-leak.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- pygobject-2.12.3/gobject/pygflags.c.memory-leak	2007-04-19 21:29:49.000000000 -0400
-+++ pygobject-2.12.3/gobject/pygflags.c	2007-04-19 21:30:33.000000000 -0400
-@@ -176,7 +176,9 @@
-     retval = PyDict_GetItem(values, pyint);
-     Py_DECREF(pyint);
- 
--    if (!retval) {
-+    if (retval) {
-+	Py_INCREF(retval);
-+    } else {
- 	PyErr_Clear();
- 
- 	retval = ((PyTypeObject *)pyclass)->tp_alloc((PyTypeObject *)pyclass, 0);
-@@ -186,7 +188,6 @@
- 	((PyGFlags*)retval)->gtype = gtype;
-     } 
- 
--    Py_INCREF(retval);
-     return retval;
- }
- 
diff --git a/pygobject2.spec b/pygobject2.spec
index e654aec..e724e69 100644
--- a/pygobject2.spec
+++ b/pygobject2.spec
@@ -1,14 +1,13 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-# Last updated for version 2.13.2
-%define automake_version        1.6.3-5
-%define glib2_version           2.8.0
+# Last updated for version 2.15.1
+%define glib2_version           2.16.0
 %define python2_version         2.3.5
 
 ### Abstract ###
 
 Name: pygobject2
-Version: 2.14.2
+Version: 2.15.1
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Languages
@@ -19,7 +18,7 @@ Source: pygobject-%{version}.tar.bz2
 
 ### Build Dependencies ###
 
-BuildRequires: automake >= %{automake_version}
+BuildRequires: automake
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: libtool
 BuildRequires: python2-devel >= %{python2_version}
@@ -28,10 +27,18 @@ BuildRequires: python2-devel >= %{python2_version}
 The %{name} package provides a convenient wrapper for the GObject library
 for use in Python programs.
 
+%package codegen
+Summary: The code generation program for PyGObject
+Group: Development/Languages
+
+%description codegen
+The package contains the C code generation program for PyGObject.
+
 %package devel
 Summary: Development files for building add-on libraries
 Group: Development/Languages
 Requires: %{name} = %{version}-%{release}
+Requires: %{name}-codegen = %{version}-%{release}
 Requires: %{name}-doc = %{version}-%{release}
 Requires: glib2-devel
 Requires: pkgconfig
@@ -76,12 +83,20 @@ rm -fr $RPM_BUILD_ROOT
 %{python_sitearch}/pygtk.*
 
 %defattr(755, root, root, 755)
+%{python_sitearch}/gtk-2.0/gio
 %{python_sitearch}/gtk-2.0/gobject
 
+%files codegen
+%defattr(755, root, root, 755)
+%{_bindir}/pygobject-codegen-2.0
+%defattr(644, root, root, 755)
+%{_datadir}/pygobject/2.0/codegen
+
 %files devel
 %defattr(644, root, root, 755)
 %dir %{_datadir}/pygobject
 %dir %{_includedir}/pygtk-2.0
+%{_datadir}/pygobject/2.0/defs
 %{_includedir}/pygtk-2.0/pygobject.h
 %{_libdir}/pkgconfig/pygobject-2.0.pc
 
@@ -91,6 +106,12 @@ rm -fr $RPM_BUILD_ROOT
 %{_datadir}/pygobject/xsl
 
 %changelog
+* Wed Jul 16 2008 Matthew Barnes <mbarnes@redhat.com> - 2.15.1-1.fc10
+- Update to 2.15.1
+- Bump glib2_version to 2.16.0.
+- Remove ancient automake_version.
+- Add a pygobject2-codegen subpackage.
+
 * Fri May 23 2008 Matthew Barnes <mbarnes@redhat.com> - 2.14.2-1.fc10
 - Update to 2.14.2
 
diff --git a/sources b/sources
index 79be3de..217fecf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0e9e9300e81847f4f7266f49d3bebbaf  pygobject-2.14.2.tar.bz2
+05bf0487c885a1ef6df615e02cac5ea6  pygobject-2.15.1.tar.bz2