diff --git a/gnome-menus.spec b/gnome-menus.spec
index 35466ef..521a236 100644
--- a/gnome-menus.spec
+++ b/gnome-menus.spec
@@ -1,23 +1,29 @@
 %define po_package gnome-menus
 %define enable_debugging 0
 
+%define python python2
+%define pyver %(%{__python} -c "import sys; print sys.version[:3]")
+
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
 Version: 2.11.1.1
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
 Source0: %{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:  redhat-menus >= 1.0
-BuildRequires: glib2-devel >= 2.6.0, gnome-vfs2-devel >= 2.8.2
+Requires: python-abi = %{pyver}
+BuildRequires: glib2-devel >= 2.6.0
+BuildRequires: %{python}-devel >= 2.3.0
 
 %description
 gnome-menus is an implementation of the draft "Desktop
 Menu Specification" from freedesktop.org. This package
 also contains the GNOME menu layout configuration files, 
-.directory files and assorted menu related utility programs.
+.directory files and assorted menu related utility programs,
+Python bindings, and a simple menu editor.
 
 %package devel
 Summary: Libraries and include files for the GNOME menu system
@@ -28,22 +34,6 @@ Requires:   %{name} = %{version}
 This package provides the necessary development libraries for 
 writing applications that use the GNOME menu system.
 
-%package python
-Summary: Python bindings for the GNOME menu system
-Group: Development/Libraries
-Requires:   %{name} = %{version}
-
-%description python
-This package provides Python bindings for the GNOME menu system.
-
-%package simple-editor
-Summary: A simple editor for the GNOME menu system.
-Group: Applications/System
-Requires:   %{name}-python = %{version}
-
-%description simple-editor
-This package provides a simple editor for the GNOME menu system.
-
 %prep
 %setup -q
 
@@ -82,6 +72,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc
 %{_libdir}/libgnome-menu.so.*
+%{_libdir}/python*/site-packages/gmenu.so
+%{_bindir}/gmenu-simple-editor
+%{_libdir}/python*/site-packages/GMenuSimpleEditor/*
+%{_datadir}/gnome-menus/glade/gmenu-simple-editor.glade
 
 %files devel
 %defattr(-, root, root)
@@ -91,17 +85,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/gnome-menus
 %{_bindir}/gnome-menu-spec-test
 
-%files python 
-%defattr(-, root, root)
-%{_libdir}/python*/site-packages/gmenu.so
-
-%files simple-editor
-%defattr(-, root, root)
-%{_bindir}/gmenu-simple-editor
-%{_libdir}/python*/site-packages/GMenuSimpleEditor/*
-%{_datadir}/gnome-menus/glade/gmenu-simple-editor.glade
-
 %changelog
+* Mon Jul 11 2005 Matthias Clasen <mclasen@redhat.com> 2.11.1.1-2
+- Undo the split into tiny subpackages, instead move
+  the Python bindings and the editor into the main package.
+- Fix dependencies
+
 * Fri Jul  8 2005 Matthias Clasen <mclasen@redhat.com> 2.11.1.1-1
 - Update to 2.11.1.1
 - Split off subpackages for python bindings and editor