diff --git a/0001-Setup-nspluginwrapper-if-available.patch b/0001-Setup-nspluginwrapper-if-available.patch
new file mode 100644
index 0000000..1a04673
--- /dev/null
+++ b/0001-Setup-nspluginwrapper-if-available.patch
@@ -0,0 +1,36 @@
+From bd03e748e07dd300015fdfee111420162f346e5f Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Mon, 14 Sep 2009 19:30:03 +0100
+Subject: [PATCH] Setup nspluginwrapper if available
+
+By calling mozilla-plugin-config on startup.
+---
+ embed/ephy-embed-single.c |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c
+index 4930f8e..aba0916 100644
+--- a/embed/ephy-embed-single.c
++++ b/embed/ephy-embed-single.c
+@@ -21,6 +21,7 @@
+ #include "config.h"
+ 
+ #define LIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY
++#define NSPLUGINWRAPPER_SETUP "/usr/bin/mozilla-plugin-config"
+ 
+ #include "ephy-embed-single.h"
+ #include "ephy-embed-prefs.h"
+@@ -333,6 +334,10 @@ ephy_embed_single_initialize (EphyEmbedSingle *single)
+   SoupCookieJar *jar;
+   char *filename;
+ 
++  /* Initialise nspluginwrapper's plugins if available */
++  if (g_file_test (NSPLUGINWRAPPER_SETUP, G_FILE_TEST_EXISTS) != FALSE)
++    g_spawn_command_line_sync (NSPLUGINWRAPPER_SETUP, NULL, NULL, NULL, NULL);
++
+   ephy_embed_prefs_init ();
+ 
+   session = webkit_get_default_session ();
+-- 
+1.6.2.5
+
diff --git a/epiphany-2.20.1-wrapped-plugins.patch b/epiphany-2.20.1-wrapped-plugins.patch
deleted file mode 100644
index c42ea2f..0000000
--- a/epiphany-2.20.1-wrapped-plugins.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -up epiphany-2.20.2/embed/mozilla/mozilla-embed-single.cpp.wrapped-plugins epiphany-2.20.2/embed/mozilla/mozilla-embed-single.cpp
---- epiphany-2.20.2/embed/mozilla/mozilla-embed-single.cpp.wrapped-plugins	2007-11-27 00:36:42.000000000 +0100
-+++ epiphany-2.20.2/embed/mozilla/mozilla-embed-single.cpp	2007-11-29 11:38:19.000000000 +0100
-@@ -294,6 +296,19 @@ mozilla_init_plugin_add_unique_paths (GL
- 	return list;
- }
- 
-+static int
-+mozilla_setup_wrapped_plugin (void)
-+{
-+	char    *p_viewer = "/usr/bin/mozilla-plugin-config";
-+	gboolean  ret;
-+
-+	if(g_file_test(p_viewer, G_FILE_TEST_EXISTS) == FALSE)
-+	    return(FALSE);
-+
-+	ret = g_spawn_command_line_sync(p_viewer,NULL,NULL,NULL,NULL);
-+	return(ret); 
-+}
-+
- static void
- mozilla_init_plugin_path ()
- {
-@@ -307,8 +322,17 @@ mozilla_init_plugin_path ()
- 						    MOZILLA_PREFIX "/lib/mozilla/plugins");
- 	list = mozilla_init_plugin_add_unique_path (list,
- 						    MOZILLA_HOME "/plugins");
--	list = mozilla_init_plugin_add_unique_path (list,
--						    MOZILLA_NATIVE_PLUGINSDIR);
-+        /* Note this only works if MOZILLA_NATIVE_PLUGINSDIR doesn't
-+ 	 * finish with a '/' */
-+	if(mozilla_setup_wrapped_plugin()) {
-+		list = mozilla_init_plugin_add_unique_path (list,
-+						    MOZILLA_NATIVE_PLUGINSDIR"-wrapped");
-+	}
-+	else {
-+        	list = mozilla_init_plugin_add_unique_path (list,
-+                                                    MOZILLA_NATIVE_PLUGINSDIR);
-+	}
-+	
- #ifdef HAVE_PRIVATE_PLUGINS
- 	list = mozilla_init_plugin_add_unique_path (list, PLUGINDIR);
- #endif
diff --git a/epiphany.spec b/epiphany.spec
index 632794b..5fa5b39 100644
--- a/epiphany.spec
+++ b/epiphany.spec
@@ -8,7 +8,7 @@
 Summary: Web browser for GNOME
 Name: epiphany
 Version: 2.27.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 %define major_version 2.27
 Provides: epiphany(abi) = %{major_version}
 License: GPLv2+ and GFDL
@@ -51,6 +51,7 @@ BuildRequires: nss-devel
 
 # Patches
 Patch0: epiphany-1.0.1-home-page.patch
+Patch1: 0001-Setup-nspluginwrapper-if-available.patch
 Patch2: epiphany-default-bookmarks.patch
 
 %description
@@ -96,6 +97,7 @@ Install epiphany-devel if you want to write extensions for epiphany.
 %setup -q
 
 %patch0 -p1 -b .homepage
+%patch1 -p1 -b .nspluginwrapper
 %patch2 -p1 -b .default-bookmarks
 
 # Fedora Epiphany version
@@ -245,6 +247,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/epiphany
 
 %changelog
+* Mon Sep 14 2009 Bastien Nocera <bnocera@redhat.com> 2.27.92-2
+- Call nspluginwrapper's config tool if available
+
 * Tue Sep  8 2009 Matthias Clasen <mclasen@redhat.com> - 2.27.92-1
 - Update to 2.27.92