diff -upr evolution-data-server-2.24.1-old/camel/camel.c evolution-data-server-2.24.1-new/camel/camel.c
--- evolution-data-server-2.24.1-old/camel/camel.c	2008-10-13 03:07:53.000000000 -0500
+++ evolution-data-server-2.24.1-new/camel/camel.c	2008-10-26 19:14:49.000000000 -0600
@@ -38,6 +38,8 @@
 #include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include <nss-shared-helper.h>
+
 #include "camel.h"
 #include "camel-certdb.h"
 #include "camel-debug.h"
@@ -78,12 +80,16 @@ camel_init (const char *configdir, gbool
 		nss_configdir = g_win32_locale_filename_from_utf8 (configdir);
 #endif
 
-		if (NSS_InitReadWrite (nss_configdir) == SECFailure) {
-			/* fall back on using volatile dbs? */
-			if (NSS_NoDB_Init (nss_configdir) == SECFailure) {
-				g_free (nss_configdir);
-				g_warning ("Failed to initialize NSS");
-				return -1;
+		if (nsshelp_open_db ("evolution", nss_configdir, 0) != SECSuccess) {
+			g_warning ("Opening non-shared cert database");
+
+			if (NSS_InitReadWrite (nss_configdir) == SECFailure) {
+				/* fall back on using volatile dbs? */
+				if (NSS_NoDB_Init (nss_configdir) == SECFailure) {
+					g_free (nss_configdir);
+					g_warning ("Failed to initialize NSS");
+					return -1;
+				}
 			}
 		}
 
diff -upr evolution-data-server-2.24.1-old/configure.in evolution-data-server-2.24.1-new/configure.in
--- evolution-data-server-2.24.1-old/configure.in	2008-10-19 22:26:33.000000000 -0500
+++ evolution-data-server-2.24.1-new/configure.in	2008-10-26 19:17:20.000000000 -0600
@@ -535,6 +535,9 @@ if test "x${enable_nss}" = "xyes" || tes
 				AC_DEFINE(ENABLE_SMIME,1,[Define if SMIME should be enabled])
 				msg_smime="yes (Mozilla NSS)"
 			fi
+
+                        mozilla_nss="$mozilla_nss nss-shared-helper"
+
 			AC_DEFINE(HAVE_NSS,1,[Define if you have NSS])
 			AC_DEFINE(HAVE_SSL,1,[Define if you have a supported SSL library])
 			MANUAL_NSPR_CFLAGS=""