diff --git a/mozilla/security/coreconf/Darwin.mk b/mozilla/security/coreconf/Darwin.mk
index 3eaff8a0d03..e578a03cd67 100644
--- a/mozilla/security/coreconf/Darwin.mk
+++ b/mozilla/security/coreconf/Darwin.mk
@@ -50,7 +50,11 @@ CPU_ARCH	:= $(shell uname -p)
 endif
 
 ifeq (,$(filter-out i%86,$(CPU_ARCH)))
+ifdef USE_64
+CC              += -arch x86_64
+else
 OS_REL_CFLAGS	= -Di386
+endif
 else
 OS_REL_CFLAGS	= -Dppc
 endif
diff --git a/mozilla/security/nss/lib/ckfw/builtins/config.mk b/mozilla/security/nss/lib/ckfw/builtins/config.mk
index 99e01097391..ca6a0c6bfdd 100644
--- a/mozilla/security/nss/lib/ckfw/builtins/config.mk
+++ b/mozilla/security/nss/lib/ckfw/builtins/config.mk
@@ -34,7 +34,7 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
-CONFIG_CVS_ID = "@(#) $RCSfile: config.mk,v $ $Revision: 1.12 $ $Date: 2008-11-19 20:09:37 $"
+CONFIG_CVS_ID = "@(#) $RCSfile: config.mk,v $ $Revision: 1.13 $ $Date: 2009-03-20 07:19:36 $"
 
 #
 #  Override TARGETS variable so that only shared libraries
@@ -60,8 +60,10 @@ endif
 # To create a loadable module on Darwin, we must use -bundle.
 #
 ifeq ($(OS_TARGET),Darwin)
+ifndef USE_64
 DSO_LDOPTS = -bundle
 endif
+endif
 
 ifeq ($(OS_TARGET),SunOS)
 # The -R '$ORIGIN' linker option instructs this library to search for its
diff --git a/mozilla/security/nss/lib/ckfw/capi/config.mk b/mozilla/security/nss/lib/ckfw/capi/config.mk
index d541c67184c..07c818fef3b 100644
--- a/mozilla/security/nss/lib/ckfw/capi/config.mk
+++ b/mozilla/security/nss/lib/ckfw/capi/config.mk
@@ -34,7 +34,7 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
-CONFIG_CVS_ID = "@(#) $RCSfile: config.mk,v $ $Revision: 1.1 $ $Date: 2005-11-04 02:05:04 $"
+CONFIG_CVS_ID = "@(#) $RCSfile: config.mk,v $ $Revision: 1.2 $ $Date: 2009-03-20 07:19:45 $"
 
 #
 #  Override TARGETS variable so that only shared libraries
@@ -60,8 +60,10 @@ endif
 # To create a loadable module on Darwin, we must use -bundle.
 #
 ifeq ($(OS_TARGET),Darwin)
+ifndef USE_64
 DSO_LDOPTS = -bundle
 endif
+endif
 
 ifeq ($(OS_TARGET),SunOS)
 # The -R '$ORIGIN' linker option instructs this library to search for its