diff --git a/evolution-data-server-1.11.90-glibc-open.patch b/evolution-data-server-1.11.90-glibc-open.patch
new file mode 100644
index 0000000..66768b5
--- /dev/null
+++ b/evolution-data-server-1.11.90-glibc-open.patch
@@ -0,0 +1,72 @@
+--- evolution-data-server-1.11.90/libdb/dbm/dbm.c.glibc-open	2007-07-05 02:02:46.000000000 -0400
++++ evolution-data-server-1.11.90/libdb/dbm/dbm.c	2007-08-15 12:45:08.000000000 -0400
+@@ -240,7 +240,7 @@ __db_ndbm_open(file, oflags, mode)
+ 	if ((ret = dbp->set_pagesize(dbp, 4096)) != 0 ||
+ 	    (ret = dbp->set_h_ffactor(dbp, 40)) != 0 ||
+ 	    (ret = dbp->set_h_nelem(dbp, 1)) != 0 ||
+-	    (ret = dbp->open(dbp, NULL,
++	    (ret = (*dbp->open)(dbp, NULL,
+ 	    path, NULL, DB_HASH, __db_oflags(oflags), mode)) != 0) {
+ 		__os_set_errno(ret);
+ 		return (NULL);
+--- evolution-data-server-1.11.90/libedataserver/e-dbhash.c.glibc-open	2007-07-05 02:01:55.000000000 -0400
++++ evolution-data-server-1.11.90/libedataserver/e-dbhash.c	2007-08-15 12:45:08.000000000 -0400
+@@ -33,9 +33,9 @@ e_dbhash_new (const char *filename)
+ 		return NULL;
+ 	}
+ 
+-	rv = db->open (db, NULL, filename, NULL, DB_HASH, 0, 0666);
++	rv = (*db->open) (db, NULL, filename, NULL, DB_HASH, 0, 0666);
+ 	if (rv != 0) {
+-		rv = db->open (db, NULL, filename, NULL, DB_HASH, DB_CREATE, 0666);
++		rv = (*db->open) (db, NULL, filename, NULL, DB_HASH, DB_CREATE, 0666);
+ 
+ 		if (rv != 0) {
+ 			db->close (db, 0);
+--- evolution-data-server-1.11.90/addressbook/backends/file/e-book-backend-file.c.glibc-open	2007-08-15 12:54:20.000000000 -0400
++++ evolution-data-server-1.11.90/addressbook/backends/file/e-book-backend-file.c	2007-08-15 12:54:58.000000000 -0400
+@@ -1100,7 +1100,7 @@ e_book_backend_file_load_source (EBookBa
+ 				(void *(*)(void *, size_t))g_try_realloc,
+ 				g_free);
+ 
+-		db_error = env->open (env, NULL, DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_THREAD, 0);
++		db_error = (*env->open) (env, NULL, DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_THREAD, 0);
+ 		if (db_error != 0) {
+ 			env->close(env, 0);
+ 			g_warning ("db_env_open failed with %s", db_strerror (db_error));
+@@ -1125,7 +1125,7 @@ e_book_backend_file_load_source (EBookBa
+ 		return db_error_to_status (db_error);
+ 	}
+ 
+-	db_error = db->open (db, NULL, filename, NULL, DB_HASH, DB_THREAD, 0666);
++	db_error = (*db->open) (db, NULL, filename, NULL, DB_HASH, DB_THREAD, 0666);
+ 
+ 	if (db_error == DB_OLD_VERSION) {
+ 		db_error = e_db3_utils_upgrade_format (filename);
+@@ -1137,7 +1137,7 @@ e_book_backend_file_load_source (EBookBa
+ 			return db_error_to_status (db_error);
+ 		}
+ 
+-		db_error = db->open (db, NULL, filename, NULL, DB_HASH, DB_THREAD, 0666);
++		db_error = (*db->open) (db, NULL, filename, NULL, DB_HASH, DB_THREAD, 0666);
+ 	}
+ 
+ 	bf->priv->file_db = db;
+@@ -1154,7 +1154,7 @@ e_book_backend_file_load_source (EBookBa
+                 	g_free (filename);
+                 	return GNOME_Evolution_Addressbook_OtherError;
+         	}
+-		db_error = db->open (db, NULL, filename, NULL, DB_HASH, DB_RDONLY | DB_THREAD, 0666);
++		db_error = (*db->open) (db, NULL, filename, NULL, DB_HASH, DB_RDONLY | DB_THREAD, 0666);
+ 
+ 		if (db_error != 0 && !only_if_exists) {
+ 			int rv;
+@@ -1181,7 +1181,7 @@ e_book_backend_file_load_source (EBookBa
+ 				return GNOME_Evolution_Addressbook_OtherError;
+ 			}
+ 
+-			db_error = db->open (db, NULL, filename, NULL, DB_HASH, DB_CREATE | DB_THREAD, 0666);
++			db_error = (*db->open) (db, NULL, filename, NULL, DB_HASH, DB_CREATE | DB_THREAD, 0666);
+ 			if (db_error != 0) {
+ 				db->close (db, 0);
+ 				g_warning ("db->open (... DB_CREATE ...) failed with %s", db_strerror (db_error));
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 597e6f6..41e0c8d 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -63,6 +63,9 @@ Patch20: evolution-data-server-1.10.1-camel-certdb-nss-cert-get.patch
 # RH bug #243296
 Patch21: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
+# GNOME bug #466987
+Patch22: evolution-data-server-1.11.90-glibc-open.patch
+
 ### Dependencies ###
 
 Requires: GConf2
@@ -151,6 +154,7 @@ evolution-data-server.
 %patch19 -p1 -b .camel-folder-symmary-crash
 %patch20 -p1 -b .camel-certdb-nss-cert-get
 %patch21 -p1 -b .fix-64bit-acinclude
+%patch22 -p1 -b .glibc-open
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -386,6 +390,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Mon Aug 13 2007 Matthew Barnes <mbarnes@redhat.com> - 1.11.90-1.fc8
 - Update to 1.11.90
+- Add patch for GNOME bug #466987 (glibc redefines "open").
 - Remove patch for GNOME bug #415891 (fixed upstream).
 
 * Wed Aug 08 2007 Matthew Barnes <mbarnes@redhat.com> - 1.11.6.1-1.fc8