diff --git a/mozilla/config/autoconf.mk.in b/mozilla/config/autoconf.mk.in
index db3c265df9d..c3bf1e86f37 100644
--- a/mozilla/config/autoconf.mk.in
+++ b/mozilla/config/autoconf.mk.in
@@ -573,6 +573,8 @@ export LIB = @MOZ_LIB@
 export PATH = @MOZ_PATH@
 endif
 endif
+DLLFLAGS = @DLLFLAGS@
+
 # python options.
 MOZ_PYTHON_EXTENSIONS = @MOZ_PYTHON_EXTENSIONS@
 MOZ_PYTHON = @MOZ_PYTHON@
diff --git a/mozilla/configure.in b/mozilla/configure.in
index ada6ff9ea49..dcb70e50172 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -6121,6 +6121,9 @@ if test "$MOZ_MEMORY"; then
     AC_DEFINE(_STATIC_CPPLIB)
     dnl Don't generate a manifest, since we're linking to a custom CRT.
     LDFLAGS="$LDFLAGS -MANIFEST:NO"
+    dnl Also pass this to NSPR/NSS
+    DLLFLAGS="$DLLFLAGS -MANIFEST:NO"
+    export DLLFLAGS
     ;;
   *)
     AC_MSG_ERROR([--enable-jemalloc not supported on ${target}])
@@ -6132,6 +6135,8 @@ AC_SUBST(WIN32_CRT_SRC_DIR)
 AC_SUBST(WIN32_CUSTOM_CRT_DIR)
 AC_SUBST(MOZ_LIB)
 AC_SUBST(MOZ_PATH)
+dnl Need to set this for make because NSS doesn't have configure
+AC_SUBST(DLLFLAGS)
 
 dnl ========================================================
 dnl = Use malloc wrapper lib
diff --git a/mozilla/security/manager/Makefile.in b/mozilla/security/manager/Makefile.in
index f8f63dfbac1..5b67d6c5a02 100644
--- a/mozilla/security/manager/Makefile.in
+++ b/mozilla/security/manager/Makefile.in
@@ -143,6 +143,9 @@ NSPR_LIB_DIR := $(subst -L,,$(subst -L$(DIST),-L$(ABS_DIST),$(NSPR_LIB_DIR)))
 else
 NSPR_LIB_DIR = $(ABS_DIST)/lib
 endif
+# Can't pass this in DEFAULT_GMAKE_FLAGS because that overrides
+# definitions in NSS, so just export it into the sub-make's environment.
+export DLLFLAGS
 # NSS makefiles are not safe for parallel execution.
 DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1
 DEFAULT_GMAKE_FLAGS += CC="$(CC)"