diff --git a/0001-Disable-font-plugin-by-default.patch b/0001-Disable-font-plugin-by-default.patch
new file mode 100644
index 0000000..52c422f
--- /dev/null
+++ b/0001-Disable-font-plugin-by-default.patch
@@ -0,0 +1,30 @@
+From 83ac6c9a151e77dcccfc2582e5a0760f459504e4 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Mon, 22 Mar 2010 15:47:07 +0000
+Subject: [PATCH] Disable font plugin by default
+
+The cursor theme for new apps is already loaded by the XSettings
+plugin, and the X core fonts are obsoleted by fontconfig. Handling
+of new fonts is done in the xsettings plugin as well.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=613604
+---
+ data/gnome-settings-daemon.schemas.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/data/gnome-settings-daemon.schemas.in b/data/gnome-settings-daemon.schemas.in
+index 16bb71f..139919b 100644
+--- a/data/gnome-settings-daemon.schemas.in
++++ b/data/gnome-settings-daemon.schemas.in
+@@ -76,7 +76,7 @@
+       <applyto>/apps/gnome_settings_daemon/plugins/font/active</applyto>
+       <owner>gnome-settings-daemon</owner>
+       <type>bool</type>
+-      <default>TRUE</default>
++      <default>FALSE</default>
+       <locale name="C">
+         <short>Enable font plugin</short>
+         <long>Set to True to enable the plugin to manage font settings.</long>
+-- 
+1.7.0.1
+
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index 5809b36..af24a19 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.29.92
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -31,6 +31,9 @@ BuildRequires:	gettext intltool
 BuildRequires:  fontconfig-devel
 BuildRequires:	libcanberra-devel
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=613604
+Patch0: 0001-Disable-font-plugin-by-default.patch
+
 # change font rendering
 Patch3: slight-hinting.patch
 
@@ -54,6 +57,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .no-font-plugin
 %patch3 -p1 -b .slight-hinting
 %patch4 -p1 -b .keyboard-icon
 
@@ -170,6 +174,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Mon Mar 22 2010 Bastien Nocera <bnocera@redhat.com> 2.29.92-3
+- Disable the font plugin by default
+
 * Wed Mar 10 2010 Bastien Nocera <bnocera@redhat.com> 2.29.92-2
 - Remove unneeded icons, already upstream