diff --git a/epiphany-mime-scheme-handler.patch b/epiphany-mime-scheme-handler.patch
new file mode 100644
index 0000000..1876019
--- /dev/null
+++ b/epiphany-mime-scheme-handler.patch
@@ -0,0 +1,22 @@
+From 6375ebd3361a02e6c996140b33979fc1061ef734 Mon Sep 17 00:00:00 2001
+From: Diego Escalante Urrelo <descalante@igalia.com>
+Date: Sun, 10 Oct 2010 19:28:24 -0500
+Subject: [PATCH] epiphany.desktop: declare ability to handle http and https
+
+Bug #631450
+---
+ data/epiphany.desktop.in.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/data/epiphany.desktop.in.in b/data/epiphany.desktop.in.in
+index 1c93f4c..fdf5ffe 100644
+--- a/data/epiphany.desktop.in.in
++++ b/data/epiphany.desktop.in.in
+@@ -13,4 +13,4 @@ X-GNOME-Bugzilla-Product=epiphany
+ X-GNOME-Bugzilla-Component=BugBuddyBugs
+ X-GNOME-Bugzilla-Version=@VERSION@
+ Categories=Network;GNOME;GTK;WebBrowser;
+-MimeType=text/html;text/xml;application/xhtml+xml;
++MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;
+-- 
+1.7.1
diff --git a/epiphany.changes b/epiphany.changes
index 1ad8c7c..0bedfaf 100644
--- a/epiphany.changes
+++ b/epiphany.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Dec 10 16:23:06 CET 2010 - vuntz@opensuse.org
+
+- Add epiphany-mime-scheme-handler.patch to register the http and
+  https scheme MIME types. This is needed because of a change in
+  how gio works.
+- Call %desktop_database_post/%desktop_database_postun in
+  %post/%postun.
+
 -------------------------------------------------------------------
 Fri Oct  1 18:40:02 CEST 2010 - vuntz@opensuse.org
 
diff --git a/epiphany.spec b/epiphany.spec
index 4e42dd4..82a4af7 100644
--- a/epiphany.spec
+++ b/epiphany.spec
@@ -29,6 +29,8 @@ Source:         %{name}-%{version}.tar.bz2
 Patch0:         epiphany-hide-bookmark-editor.patch
 # PATCH-FIX-UPSTREAM epiphany-fix-introspection-build.patch bgo#631119 vuntz@opensuse.org -- Fix build with recent g-i
 Patch1:         epiphany-fix-introspection-build.patch
+# PATCH-FIX-UPSTREAM epiphany-mime-scheme-handler.patch bgo#631450 vuntz@opensuse.org -- Taken from git, register http/https-related mime types
+Patch2:         epiphany-mime-scheme-handler.patch
 # PATCH-FEATURE-OPENSUSE epiphany-safe-one-click-install.patch bnc330070 vuntz@novell.com -- Make one-click install work with one-click
 Patch6:         epiphany-safe-one-click-install.patch
 BuildRequires:  NetworkManager-devel
@@ -99,6 +101,7 @@ This package provides upstream Look and Feel for Epiphany.
 translation-update-upstream
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %patch6 -p1
 
 %build
@@ -142,13 +145,17 @@ rm -rf %{buildroot}
 
 %pre -f %{name}.schemas_pre
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+%desktop_database_post
 
 %posttrans -f %{name}.schemas_posttrans
 
 %preun -f %{name}.schemas_preun
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+%desktop_database_postun
 
 %files -f %{name}.schemas_list
 %defattr(-,root,root)