diff --git a/epiphany.changes b/epiphany.changes
index 9bebc6e..961e3aa 100644
--- a/epiphany.changes
+++ b/epiphany.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Aug 24 15:49:35 CEST 2010 - vuntz@opensuse.org
+
+- Do not call autoreconf: this is not needed anymore.
+- Remove gcc-c++, gnome-common, gtk-doc BuildRequires.
+- Remove gir-repository BuildRequires: not needed anymore.
+- Merge doc subpackage with devel subpackage, since this is
+  developer documentation.
+
 -------------------------------------------------------------------
 Tue Aug 17 15:35:08 CEST 2010 - dimstar@opensuse.org
 
diff --git a/epiphany.spec b/epiphany.spec
index acace60..2712186 100644
--- a/epiphany.spec
+++ b/epiphany.spec
@@ -32,15 +32,11 @@ Patch6:         epiphany-safe-one-click-install.patch
 BuildRequires:  NetworkManager-devel
 BuildRequires:  ca-certificates
 BuildRequires:  fdupes
-BuildRequires:  gcc-c++
 BuildRequires:  gconf2-devel
-BuildRequires:  gir-repository
-BuildRequires:  gnome-common
 BuildRequires:  gnome-doc-utils-devel
 BuildRequires:  gnome-icon-theme
 BuildRequires:  gnome-themes
 BuildRequires:  gobject-introspection-devel
-BuildRequires:  gtk-doc
 BuildRequires:  intltool
 BuildRequires:  iso-codes-devel
 BuildRequires:  libavahi-gobject-devel
@@ -78,23 +74,13 @@ Requires:       %{name} = %{version}
 Requires:       gtk2-devel
 Requires:       libwebkitgtk-devel
 Requires:       libxml2-devel
+Provides:       %{name}-doc = %{version}
+Obsoletes:      %{name}-doc < %{version}
 
 %description devel
 Epiphany is a Web Browser for the GNOME Desktop. Its principles are
 simplicity and standards compliance.
 
-%package doc
-License:        GPLv2+
-Summary:        Developer Documentation for Epiphany
-Group:          Productivity/Networking/Web/Browsers
-Requires:       %{name} = %{version}
-
-%description doc
-Epiphany is a Web Browser for the GNOME Desktop. Its principles are
-simplicity and standards compliance.
-
-This package contains developer documentation for epiphany.
-
 %package branding-upstream
 License:        GPLv2+
 Summary:        Upstream branding of Epiphany
@@ -117,14 +103,13 @@ translation-update-upstream
 %patch6 -p1
 
 %build
-ACLOCAL="aclocal -I m4" autoreconf -f -i
 %configure \
     --disable-scrollkeeper \
+    --disable-maintainer-mode \
+    --enable-introspection \
     --enable-zeroconf \
     --enable-network-manager \
-    --enable-introspection \
     --enable-seed \
-    --disable-maintainer-mode \
 %if 0%{?suse_version} > 1120
     --with-ca-file=%{_sysconfdir}/ssl/ca-bundle.pem
 %else
@@ -187,14 +172,11 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root)
+%doc %{_datadir}/gtk-doc/html/epiphany/
 %{_datadir}/aclocal/*.m4
 %{_includedir}/epiphany*
 %{_libdir}/pkgconfig/*.pc
 
-%files doc
-%defattr(-,root,root)
-%{_datadir}/gtk-doc/html/epiphany
-
 %files branding-upstream
 %defattr(-,root,root)
 %{_datadir}/epiphany/default-bookmarks.rdf