diff --git a/evolution-2.12.2-auto-contacts.patch b/evolution-2.12.2-auto-contacts.patch
new file mode 100644
index 0000000..0f7a62f
--- /dev/null
+++ b/evolution-2.12.2-auto-contacts.patch
@@ -0,0 +1,22 @@
+diff -up evolution-2.12.2/plugins/bbdb/bbdb.c.auto-contacts evolution-2.12.2/plugins/bbdb/bbdb.c
+--- evolution-2.12.2/plugins/bbdb/bbdb.c.auto-contacts	2007-11-29 19:54:24.000000000 +0100
++++ evolution-2.12.2/plugins/bbdb/bbdb.c	2007-11-29 19:59:48.000000000 +0100
+@@ -307,9 +307,17 @@ bbdb_open_addressbook (int type)
+ 
+ 	gboolean     status;
+ 	GError      *error = NULL;
+-	
++	gboolean enable = TRUE;	
+ 	gconf = gconf_client_get_default ();
+ 
++	/* Check to see if we're supposed to be running */
++	if (type == AUTOMATIC_CONTACTS_ADDRESSBOOK)
++		enable = gconf_client_get_bool (gconf, GCONF_KEY_ENABLE, NULL);
++	if (!enable) {
++		g_object_unref (G_OBJECT (gconf));
++		return NULL;
++	}
++
+ 	/* Open the appropriate addresbook. */
+ 	if (type == GAIM_ADDRESSBOOK)
+ 		uri = gconf_client_get_string (gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, NULL);
diff --git a/evolution.spec b/evolution.spec
index 5faeca7..527bc74 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -46,7 +46,7 @@
 
 Name: evolution
 Version: 2.12.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -129,6 +129,9 @@ Patch36: evolution-2.11.92-icon-names.patch
 # GNOME bug #454465
 Patch37: evolution-2.12.1-source-changed-event.patch
 
+# RH bug #404591 / GN-bug #491062
+Patch38: evolution-2.12.2-auto-contacts.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -273,6 +276,7 @@ This package contains the help for Evolution.
 %patch35 -p1 -b .mail-attachment
 %patch36 -p1 -b .icon-names
 %patch37 -p1 -b .source-changed-event
+%patch38 -p1 -b .auto-contacts
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -723,6 +727,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/omf/evolution
 
 %changelog
+* Thu Nov 29 2007 Milan Crha <mcrha@redhat.com> - 2.12.2-2.fc8
+- Add patch for RH bug #404591 (do not add automatic contacts
+  if disabled)
+
 * Tue Nov 27 2007 Milan Crha <mcrha@redhat.com> - 2.12.2-1.fc8
 - Update to 2.12.2