diff --git a/gedit.changes b/gedit.changes
index 03aaf46..3176359 100644
--- a/gedit.changes
+++ b/gedit.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Sun Feb 13 12:47:33 CET 2011 - vuntz@opensuse.org
+
+- Call relevant macros in %post/%postun:
+  + %desktop_database_post/postun because the package ships at
+    least one desktop file.
+- Pass %{?no_lang_C} to %find_lang so that english documentation
+  can be packaged with the program, and not in the lang subpackage.
+- Change Requires of lang subpackage to Recommends, since the
+  english documentation is not there anymore.
+- Remove 2.x references in summaries and descriptions.
+- Drop doc subpackage as it contained developer doc that should be
+  in the devel subpackage.
+
 -------------------------------------------------------------------
 Tue Sep 28 13:27:44 CEST 2010 - vuntz@opensuse.org
 
diff --git a/gedit.spec b/gedit.spec
index 8736971..fcd41a8 100644
--- a/gedit.spec
+++ b/gedit.spec
@@ -20,8 +20,9 @@
 Name:           gedit
 Version:        2.30.4
 Release:        1
+# NOTE: on upgrade to a new upstream version, change the doc Obsoletes from <= to <
 License:        GPLv2+
-Summary:        The Editor for the GNOME 2.x Desktop
+Summary:        Small and lightweight UTF-8 text editor
 Url:            http://www.gnome.org
 Group:          Productivity/Text/Editors
 Source:         ftp://ftp.gnome.org/pub/gnome/sources/gedit/2.25/%{name}-%{version}.tar.bz2
@@ -43,40 +44,35 @@ BuildRequires:  python-gtk-devel
 BuildRequires:  python-gtksourceview-devel
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
-Requires:       %{name}-lang = %{version}
 Requires:       python-gnome
 Requires:       python-gobject2
 Requires:       python-gtk
 Requires:       python-gtksourceview
+Recommends:     %{name}-lang
 Provides:       gedit2 = %{version}
 Obsoletes:      gedit2 < %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %gconf_schemas_prereq
 
 %description
-Gedit is a small, fast, and reliable editor for the GNOME 2.x Desktop.
+Gedit is a small and lightweight UTF-8 text editor for the GNOME
+environment.
 
 %package devel
 License:        GPLv2+
-Summary:        The Editor for the GNOME 2.x Desktop
+Summary:        Small and lightweight UTF-8 text editor
 Group:          Productivity/Text/Editors
 Requires:       %{name} = %{version}
 Requires:       gtksourceview-devel
 Provides:       gedit2-devel = %{version}
 Obsoletes:      gedit2-devel < %{version}
+Provides:       %{name}-doc = %{version}
+# Note: we keep <= (and a rpmlint warning...) until we get a version higher than 2.30.4 (when this provides/obsoletes was introduced)
+Obsoletes:      %{name}-doc <= %{version}
 
 %description devel
-Gedit is a small, fast, and reliable editor for the GNOME 2.x Desktop.
-
-%package doc
-License:        GPLv2+
-Summary:        Additional documentation of  the Editor for the GNOME 2.x Desktop
-Group:          Productivity/Text/Editors
-Requires:       gtk-doc
-
-%description doc
-This package contains additional documentation for Gedit (a small, fast,
-and reliable editor for the GNOME 2.x Desktop).
+Gedit is a small and lightweight UTF-8 text editor for the GNOME
+environment.
 
 %lang_package
 %prep
@@ -99,7 +95,7 @@ make %{?jobs:-j%jobs}
 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
 %endif
 %suse_update_desktop_file -N gedit -G "Text Editor" gedit TextEditor
-%find_lang %{name}
+%find_lang %{name} %{?no_lang_C}
 %find_gconf_schemas
 rm %{buildroot}%{_libdir}/*/*/*.*a
 %fdupes %{buildroot}
@@ -109,13 +105,26 @@ rm -rf %{buildroot}
 
 %pre -f %{name}.schemas_pre
 
+%post
+%desktop_database_post
+
 %posttrans -f %{name}.schemas_posttrans
 
 %preun -f %{name}.schemas_preun
 
+%postun
+%desktop_database_postun
+
 %files -f %{name}.schemas_list
 %defattr(-, root, root)
 %doc AUTHORS BUGS ChangeLog COPYING MAINTAINERS NEWS README
+%dir %{_datadir}/gnome/
+%dir %{_datadir}/gnome/help/
+%dir %{_datadir}/gnome/help/%{name}/
+%doc %{_datadir}/gnome/help/%{name}/C/
+%dir %{_datadir}/omf/
+%dir %{_datadir}/omf/%{name}/
+%doc %{_datadir}/omf/%{name}/%{name}-C.omf
 %{_bindir}/gedit
 %{_bindir}/gnome-text-editor
 %{_datadir}/applications/*.desktop
@@ -128,11 +137,8 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-, root, root)
+%doc %{_datadir}/gtk-doc/html/gedit/
 %{_includedir}/*
 %{_libdir}/pkgconfig/*.pc
 
-%files doc
-%defattr(-, root, root)
-%{_datadir}/gtk-doc/html/gedit
-
 %changelog