diff --git a/epiphany-2.30.2.tar.bz2 b/epiphany-2.30.2.tar.bz2
new file mode 100644
index 0000000..6e48de6
--- /dev/null
+++ b/epiphany-2.30.2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cd0124e71e72142593cfeb442d58d97e99ba94ace6e31d94717fe977c0bfb98a
+size 5881032
diff --git a/epiphany-2.30.3.tar.bz2 b/epiphany-2.30.3.tar.bz2
deleted file mode 100644
index b171483..0000000
--- a/epiphany-2.30.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5c3825c31c5bd01bccb9404c59c13e74fb7bc490a79fc3da56d06e1817f7bd2e
-size 5924934
diff --git a/epiphany.changes b/epiphany.changes
index 961e3aa..5dc7013 100644
--- a/epiphany.changes
+++ b/epiphany.changes
@@ -1,33 +1,3 @@
--------------------------------------------------------------------
-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
-
-- Update to version 2.30.3:
-  + bgo#624421: Adapt to GtkNotebook signal signature changes
-  + Fix crash when trying to load URIs with no path
-  + bgo#611400: Open URIs on new tab when middle-clicking on an
-    history item
-  + bgo#539716: Connect to the 'cleared' signal and change the
-    sensitivity flags
-  + bgo#539716: Split EphyNavigationAction in one abstract class
-    and two subclasses
-  + bgo#539716: Make sure WebKitWebHistory is cleared when cleared
-    EphyHistory
-  + bgo#136292: Send 'Referer' on headers sent for context menu
-    HTTP downloads
-  + bgo#611445: ephy-toolbar: fix leave-fullscreen item visibility
-  + Updated translations.
-- Pass --disable-maintainer-mode to configure to support building
-  with gtk 2.21.6, which deprecated some more symbols.
-
 -------------------------------------------------------------------
 Sat Aug  7 12:18:27 CEST 2010 - vuntz@opensuse.org
 
diff --git a/epiphany.spec b/epiphany.spec
index 2712186..e43e327 100644
--- a/epiphany.spec
+++ b/epiphany.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package epiphany (Version 2.30.3)
+# spec file for package epiphany (Version 2.30.2)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,8 +18,8 @@
 
 
 Name:           epiphany
-Version:        2.30.3
-Release:        1
+Version:        2.30.2
+Release:        6
 License:        GPLv2+
 Summary:        GNOME Web Browser Based on the WebKit Rendering Engine
 Url:            http://www.gnome.org/projects/epiphany/
@@ -32,11 +32,15 @@ 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
@@ -74,13 +78,23 @@ 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
@@ -103,12 +117,12 @@ 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 \
 %if 0%{?suse_version} > 1120
     --with-ca-file=%{_sysconfdir}/ssl/ca-bundle.pem
@@ -172,11 +186,14 @@ 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