diff --git a/epiphany.spec b/epiphany.spec
index 280c204..8db670c 100644
--- a/epiphany.spec
+++ b/epiphany.spec
@@ -1,7 +1,7 @@
 Name: epiphany
 Epoch: 1
 Version: 3.12.1
-Release: 4.20140822gitb0af36e%{?dist}
+Release: 5.20140822gitb0af36e%{?dist}
 Summary: Web browser for GNOME
 
 License: GPLv2+ and CC-BY-SA
@@ -37,9 +37,7 @@ BuildRequires: gsettings-desktop-schemas-devel
 BuildRequires: gobject-introspection-devel
 BuildRequires: sqlite-devel
 
-Requires: %{name}-runtime
-Requires: gsettings-desktop-schemas
-Requires: iso-codes
+Requires: %{name}-runtime%{?_isa} = %{version}-%{release}
 
 # https://mail.gnome.org/archives/epiphany-list/2012-October/msg00006.html
 Obsoletes: epiphany-extensions < 3.7.0
@@ -53,6 +51,8 @@ application.
 
 %package runtime
 Summary: Epiphany runtime suitable for web applications
+Requires: gsettings-desktop-schemas
+Requires: iso-codes
 
 %description runtime
 This package provides a runtime for web applications without actually
@@ -72,12 +72,18 @@ make install DESTDIR=$RPM_BUILD_ROOT
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 %find_lang %{name} --with-gnome
 
+%post
+update-desktop-database %{_datadir}/applications &> /dev/null || :
+
 %postun
+update-desktop-database %{_datadir}/applications &> /dev/null || :
+
+%postun runtime
 if [ $1 -eq 0 ]; then
   glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 fi
 
-%posttrans
+%posttrans runtime
 glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %files -f %{name}.lang
@@ -101,6 +107,13 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_mandir}/man*/*
 
 %changelog
+* Sat Aug 23 2014 Michael Catanzaro <mcatanzaro@gnome.org> - 1:3.12.1-5
+- Spec file fixes pointed of by Kalev:
+ - Restore calls to update-desktop-database "cleaned up" in the last build
+ - Add %{?_isa} = %{version}-%{release} to -runtime subpackage requirement
+ - Move runtime dependencies to -runtime subpackage
+ - Call glib-compile-schemas in -runtime subpackage's scriptlets
+
 * Fri Aug 22 2014 Michael Catanzaro <mcatanzaro@gnome.org> - 1:3.12.1-4
 - Update to git snapshot
 - Fix license to GPLv2+ and CC-BY-SA, was GPLv2+ and GFDL prior to 3.10