diff --git a/cmd/libpkix/testutil/config.mk b/cmd/libpkix/testutil/config.mk
index 820dbb2d47..f1f6674f90 100644
--- a/cmd/libpkix/testutil/config.mk
+++ b/cmd/libpkix/testutil/config.mk
@@ -5,11 +5,4 @@
 
 # don't build the static library
 LIBRARY =
-
-ifeq (,$(filter-out WIN%,$(OS_TARGET)))
-
-# don't want the 32 in the shared library name
-SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
-
-endif
+RES =
diff --git a/coreconf/OS2.mk b/coreconf/OS2.mk
index 17a8df5d24..d0fcdfd374 100644
--- a/coreconf/OS2.mk
+++ b/coreconf/OS2.mk
@@ -140,6 +140,10 @@ ifndef DLL_PREFIX
     DLL_PREFIX = $(NULL)
 endif
 
+ifndef IMPORT_LIB_SUFFIX
+    IMPORT_LIB_SUFFIX = .$(LIB_SUFFIX)
+endif
+
 #
 # override the TARGETS defined in ruleset.mk, adding IMPORT_LIBRARY
 #
@@ -147,8 +151,3 @@ ifndef TARGETS
     TARGETS = $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(PROGRAM)
 endif
 
-
-ifdef LIBRARY_NAME
-    IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).lib
-endif
-
diff --git a/coreconf/WIN32.mk b/coreconf/WIN32.mk
index 0ef16895cd..c2d9336244 100644
--- a/coreconf/WIN32.mk
+++ b/coreconf/WIN32.mk
@@ -364,15 +364,6 @@ ifneq ($(CPU_ARCH),x386)
     CPU_TAG = _$(CPU_ARCH)
 endif
 
-#
-# override ruleset.mk, removing the "lib" prefix for library names, and
-# adding the "32" after the LIBRARY_VERSION.
-#
-ifdef LIBRARY_NAME
-    SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)32$(JDK_DEBUG_SUFFIX).dll
-    IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)32$(JDK_DEBUG_SUFFIX).lib
-endif
-
 #
 # override the TARGETS defined in ruleset.mk, adding IMPORT_LIBRARY
 #
diff --git a/coreconf/ruleset.mk b/coreconf/ruleset.mk
index 43ea718e41..ff4391d140 100644
--- a/coreconf/ruleset.mk
+++ b/coreconf/ruleset.mk
@@ -79,20 +79,54 @@ endif
 # - (3) IMPORT_LIBRARY: an import library, defined in $(OS_TARGET).mk
 # - (4) PROGRAM: an executable binary
 #
-# NOTE:  The names of libraries can be generated by simply specifying
-# LIBRARY_NAME (and LIBRARY_VERSION in the case of non-static libraries).
-# LIBRARY and SHARED_LIBRARY may be defined differently in $(OS_TARGET).mk
+# A library is build by specifying the LIBRARY_NAME variable.
+# If you want to build only a static library, set SHARED_LIBRARY = $(NULL)
+# If you want to build only a shared library, set LIBRARY = $(NULL)
+# You can specify the shared library major version via LIBRARY_VERSION.
 #
+# Normally you want to link to the shared library. In this case you must
+# provide an export script, like:
+#   MAPFILE = $(OBJDIR)/$(LIBRARY_NAME).def.
+# Unfortunatly this variable is needed by the ARCH setup, so you have to set
+# it explicitly in the manifest.mn.
+#
+# Per default, it's assumed the shared library provides resource specification
+# in the file RES. You can set it to $(NULL), if that is not true.
+#
+# If you have an unversioned SHARED_LIBRARY, you must explicitly change or
+# disable the static LIBRARY, as these normally clash on Windows.
 
 ifdef LIBRARY_NAME
     ifndef LIBRARY
-	LIBRARY        = $(OBJDIR)/$(LIB_PREFIX)$(LIBRARY_NAME).$(LIB_SUFFIX)
+	LIBRARY := $(OBJDIR)/$(LIB_PREFIX)$(LIBRARY_NAME).$(LIB_SUFFIX)
     endif
     ifndef SHARED_LIBRARY
-	SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).$(DLL_SUFFIX)
+	SHARED_LIBRARY := $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).$(DLL_SUFFIX)
+    endif
+
+    ifneq ($(SHARED_LIBRARY),)
+
+    ifdef IMPORT_LIB_SUFFIX
+    ifdef MAPFILE
+    ifndef IMPORT_LIBRARY
+	IMPORT_LIBRARY := $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX)$(IMPORT_LIB_SUFFIX)
+    endif
+    endif
     endif
+
     ifndef MAPFILE_SOURCE
-	MAPFILE_SOURCE = $(LIBRARY_NAME).def
+	MAPFILE_SOURCE := $(LIBRARY_NAME).def
+    endif
+
+    ifeq (,$(filter-out WIN%,$(OS_TARGET)))
+    ifndef RES
+	RES := $(OBJDIR)/$(LIBRARY_NAME).res
+    endif
+    ifndef RESNAME
+	RESNAME := $(LIBRARY_NAME).rc
+    endif
+    endif
+
     endif
 endif
 
diff --git a/coreconf/suffix.mk b/coreconf/suffix.mk
index 584bdf55de..8050e4ac52 100644
--- a/coreconf/suffix.mk
+++ b/coreconf/suffix.mk
@@ -40,11 +40,6 @@ ifndef DYNAMIC_LIB_SUFFIX
     DYNAMIC_LIB_SUFFIX = .$(DLL_SUFFIX)
 endif
 
-# WIN% overridese this
-ifndef IMPORT_LIB_SUFFIX
-    IMPORT_LIB_SUFFIX = 
-endif
-
 
 ifndef STATIC_LIB_SUFFIX_FOR_LINKING
     STATIC_LIB_SUFFIX_FOR_LINKING = $(STATIC_LIB_SUFFIX)
diff --git a/gtests/common/Makefile b/gtests/common/Makefile
index 1476e45df0..59c5194097 100644
--- a/gtests/common/Makefile
+++ b/gtests/common/Makefile
@@ -20,8 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-SHARED_LIBRARY = $(NULL)
-IMPORT_LIBRARY = $(NULL)
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
diff --git a/gtests/common/manifest.mn b/gtests/common/manifest.mn
index 5d36c269f5..2514c9fbf5 100644
--- a/gtests/common/manifest.mn
+++ b/gtests/common/manifest.mn
@@ -7,6 +7,7 @@ DEPTH      = ../..
 MODULE = nss
 
 LIBRARY_NAME = gtestutil
+SHARED_LIBRARY = $(NULL)
 
 ifeq ($(NSS_BUILD_UTIL_ONLY),1)
 CPPSRCS = gtests-util.cc
diff --git a/gtests/google_test/Makefile b/gtests/google_test/Makefile
index f801ba1d45..0d547e0803 100644
--- a/gtests/google_test/Makefile
+++ b/gtests/google_test/Makefile
@@ -20,8 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-SHARED_LIBRARY = $(NULL)
-IMPORT_LIBRARY = $(NULL)
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
diff --git a/gtests/google_test/manifest.mn b/gtests/google_test/manifest.mn
index 2858dc72d3..7c60f11e59 100644
--- a/gtests/google_test/manifest.mn
+++ b/gtests/google_test/manifest.mn
@@ -8,6 +8,7 @@ DEPTH = ../..
 MODULE = gtest
 
 LIBRARY_NAME = gtest
+SHARED_LIBRARY = $(NULL)
 
 INCLUDES += -Igtest/include/ -Igtest
 
diff --git a/gtests/pkcs11testmodule/Makefile b/gtests/pkcs11testmodule/Makefile
index a052055f3a..77d2482f36 100644
--- a/gtests/pkcs11testmodule/Makefile
+++ b/gtests/pkcs11testmodule/Makefile
@@ -20,14 +20,11 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-LIBRARY = $(NULL)
-IMPORT_LIBRARY = $(NULL)
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
diff --git a/gtests/pkcs11testmodule/config.mk b/gtests/pkcs11testmodule/config.mk
deleted file mode 100644
index a1e2df79db..0000000000
--- a/gtests/pkcs11testmodule/config.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# can't do this in manifest.mn because OS_TARGET isn't defined there.
-ifeq (,$(filter-out WIN%,$(OS_TARGET)))
-
-# don't want the 32 in the shared library name
-SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
-
-RES = $(OBJDIR)/$(LIBRARY_NAME).res
-RESNAME = $(LIBRARY_NAME).rc
-
-endif
diff --git a/gtests/pkcs11testmodule/manifest.mn b/gtests/pkcs11testmodule/manifest.mn
index 3c0e40778b..1561c041e8 100644
--- a/gtests/pkcs11testmodule/manifest.mn
+++ b/gtests/pkcs11testmodule/manifest.mn
@@ -14,9 +14,10 @@ INCLUDES += -I$(CORE_DEPTH)/cpputil
 
 REQUIRES = cpputil
 
-MAPFILE = $(OBJDIR)/pkcs11testmodule.def
-
 LIBRARY_NAME = pkcs11testmodule
+MAPFILE = $(OBJDIR)/$(LIBRARY_NAME).def
+LIBRARY = $(NULL)
+IMPORT_LIBRARY = $(NULL)
 
 EXTRA_LIBS = $(DIST)/lib/$(LIB_PREFIX)cpputil.$(LIB_SUFFIX) \
              $(NULL)
diff --git a/lib/ckfw/builtins/config.mk b/lib/ckfw/builtins/config.mk
index 6bd62f1558..b94d413336 100644
--- a/lib/ckfw/builtins/config.mk
+++ b/lib/ckfw/builtins/config.mk
@@ -13,12 +13,6 @@ LIBRARY        =
 IMPORT_LIBRARY =
 PROGRAM        =
 
-ifeq (,$(filter-out WIN%,$(OS_TARGET)))
-    SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-    RES = $(OBJDIR)/$(LIBRARY_NAME).res
-    RESNAME = $(LIBRARY_NAME).rc
-endif
-
 ifdef BUILD_IDG
     DEFINES += -DNSSDEBUG
 endif
diff --git a/lib/ckfw/builtins/manifest.mn b/lib/ckfw/builtins/manifest.mn
index 5e6740f893..3ec01f2029 100644
--- a/lib/ckfw/builtins/manifest.mn
+++ b/lib/ckfw/builtins/manifest.mn
@@ -8,7 +8,6 @@ CORE_DEPTH = ../../..
 DIRS = testlib
 
 MODULE = nss
-MAPFILE = $(OBJDIR)/nssckbi.def
 
 EXPORTS =		\
 	nssckbi.h	\
@@ -30,3 +29,4 @@ CSRCS =			\
 REQUIRES = nspr
 
 LIBRARY_NAME = nssckbi
+MAPFILE = $(OBJDIR)/$(LIBRARY_NAME).def
diff --git a/lib/ckfw/builtins/testlib/config.mk b/lib/ckfw/builtins/testlib/config.mk
index 39a39dae9b..cdd49c2417 100644
--- a/lib/ckfw/builtins/testlib/config.mk
+++ b/lib/ckfw/builtins/testlib/config.mk
@@ -13,12 +13,6 @@ LIBRARY        =
 IMPORT_LIBRARY =
 PROGRAM        =
 
-ifeq (,$(filter-out WIN%,$(OS_TARGET)))
-	SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-	RES = $(OBJDIR)/$(LIBRARY_NAME).res
-	RESNAME = $(LIBRARY_NAME).rc
-endif
-
 ifdef BUILD_IDG
 	DEFINES += -DNSSDEBUG
 endif
diff --git a/lib/ckfw/capi/config.mk b/lib/ckfw/capi/config.mk
index ec0a86271c..3442f8ccbb 100644
--- a/lib/ckfw/capi/config.mk
+++ b/lib/ckfw/capi/config.mk
@@ -13,12 +13,6 @@ LIBRARY        =
 IMPORT_LIBRARY =
 PROGRAM        =
 
-ifeq (,$(filter-out WIN%,$(OS_TARGET)))
-    SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-    RES = $(OBJDIR)/$(LIBRARY_NAME).res
-    RESNAME = $(LIBRARY_NAME).rc
-endif
-
 ifdef BUILD_IDG
     DEFINES += -DNSSDEBUG
 endif
diff --git a/lib/ckfw/capi/manifest.mn b/lib/ckfw/capi/manifest.mn
index 38effd7591..c28e691ecd 100644
--- a/lib/ckfw/capi/manifest.mn
+++ b/lib/ckfw/capi/manifest.mn
@@ -6,7 +6,6 @@
 CORE_DEPTH = ../../../..
 
 MODULE = nss
-MAPFILE = $(OBJDIR)/nsscapi.def
 
 EXPORTS =		\
 	nsscapi.h	\
@@ -29,5 +28,6 @@ CSRCS =			\
 REQUIRES = nspr
 
 LIBRARY_NAME = nsscapi
+MAPFILE = $(OBJDIR)/$(LIBRARY_NAME).def
 
 #EXTRA_SHARED_LIBS = -L$(DIST)/lib -lnssckfw -lnssb -lplc4 -lplds4
diff --git a/lib/freebl/config.mk b/lib/freebl/config.mk
index 918a66363f..a4182a4186 100644
--- a/lib/freebl/config.mk
+++ b/lib/freebl/config.mk
@@ -47,10 +47,6 @@ endif
 
 ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 
-# don't want the 32 in the shared library name
-SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-
-RES     = $(OBJDIR)/$(LIBRARY_NAME).res
 RESNAME = freebl.rc
 
 ifdef NS_USE_GCC
diff --git a/lib/nss/config.mk b/lib/nss/config.mk
index a17f3ef5ca..3716721d93 100644
--- a/lib/nss/config.mk
+++ b/lib/nss/config.mk
@@ -6,13 +6,6 @@
 # can't do this in manifest.mn because OS_TARGET isn't defined there.
 ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 
-# don't want the 32 in the shared library name
-SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
-
-RES = $(OBJDIR)/$(LIBRARY_NAME).res
-RESNAME = $(LIBRARY_NAME).rc
-
 ifdef NS_USE_GCC
 EXTRA_SHARED_LIBS += \
 	-L$(DIST)/lib \
diff --git a/lib/nss/manifest.mn b/lib/nss/manifest.mn
index 54bed49e63..312aa53846 100644
--- a/lib/nss/manifest.mn
+++ b/lib/nss/manifest.mn
@@ -22,10 +22,9 @@ CSRCS = \
 	utilwrap.c \
 	$(NULL)
 
-MAPFILE = $(OBJDIR)/nss.def
-
 LIBRARY_NAME = nss
 LIBRARY_VERSION = 3
+MAPFILE = $(OBJDIR)/$(LIBRARY_NAME).def
 
 # This part of the code, including all sub-dirs, can be optimized for size
 export ALLOW_OPT_CODE_SIZE = 1
diff --git a/lib/smime/config.mk b/lib/smime/config.mk
index 85d39e825f..76aab75442 100644
--- a/lib/smime/config.mk
+++ b/lib/smime/config.mk
@@ -7,13 +7,6 @@ RELEASE_LIBS = $(TARGETS)
 
 ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 
-# don't want the 32 in the shared library name
-SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
-
-RES = $(OBJDIR)/smime.res
-RESNAME = smime.rc
-
 ifdef NS_USE_GCC
 EXTRA_SHARED_LIBS += \
 	-L$(DIST)/lib \
diff --git a/lib/smime/manifest.mn b/lib/smime/manifest.mn
index e049d8873a..f453d25949 100644
--- a/lib/smime/manifest.mn
+++ b/lib/smime/manifest.mn
@@ -17,7 +17,6 @@ PRIVATE_EXPORTS = \
 	$(NULL)
 
 MODULE = nss
-MAPFILE = $(OBJDIR)/smime.def
 
 CSRCS = \
 	cmsarray.c \
@@ -46,6 +45,7 @@ CSRCS = \
 
 LIBRARY_NAME = smime
 LIBRARY_VERSION = 3
+MAPFILE = $(OBJDIR)/$(LIBRARY_NAME).def
 
 # This part of the code, including all sub-dirs, can be optimized for size
 export ALLOW_OPT_CODE_SIZE = 1
diff --git a/lib/softoken/config.mk b/lib/softoken/config.mk
index 2924b24f86..14ea5d6e45 100644
--- a/lib/softoken/config.mk
+++ b/lib/softoken/config.mk
@@ -13,13 +13,6 @@ EXTRA_LIBS += \
 # can't do this in manifest.mn because OS_TARGET isn't defined there.
 ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 
-# don't want the 32 in the shared library name
-SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
-
-RES = $(OBJDIR)/$(LIBRARY_NAME).res
-RESNAME = $(LIBRARY_NAME).rc
-
 ifdef NS_USE_GCC
 EXTRA_SHARED_LIBS += \
 	-L$(SQLITE_LIB_DIR) \
diff --git a/lib/softoken/legacydb/config.mk b/lib/softoken/legacydb/config.mk
index ac7240e4b4..54a23c3b0d 100644
--- a/lib/softoken/legacydb/config.mk
+++ b/lib/softoken/legacydb/config.mk
@@ -14,13 +14,6 @@ EXTRA_LIBS += \
 # can't do this in manifest.mn because OS_TARGET isn't defined there.
 ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 
-# don't want the 32 in the shared library name
-SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
-
-RES = $(OBJDIR)/$(LIBRARY_NAME).res
-RESNAME = $(LIBRARY_NAME).rc
-
 ifdef NS_USE_GCC
 EXTRA_SHARED_LIBS += \
 	-L$(DIST)/lib \
diff --git a/lib/softoken/legacydb/manifest.mn b/lib/softoken/legacydb/manifest.mn
index 9cce849f6c..caac524be0 100644
--- a/lib/softoken/legacydb/manifest.mn
+++ b/lib/softoken/legacydb/manifest.mn
@@ -10,7 +10,7 @@ REQUIRES = dbm
 
 LIBRARY_NAME = nssdbm
 LIBRARY_VERSION = 3
-MAPFILE = $(OBJDIR)/nssdbm.def
+MAPFILE = $(OBJDIR)/$(LIBRARY_NAME).def
 
 DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DLG_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\"
 
diff --git a/lib/softoken/manifest.mn b/lib/softoken/manifest.mn
index 62c5d35cfa..e0766020ec 100644
--- a/lib/softoken/manifest.mn
+++ b/lib/softoken/manifest.mn
@@ -9,7 +9,7 @@ DIRS = legacydb
 
 LIBRARY_NAME = softokn
 LIBRARY_VERSION = 3
-MAPFILE = $(OBJDIR)/softokn.def
+MAPFILE = $(OBJDIR)/$(LIBRARY_NAME).def
 
 DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\"
 
diff --git a/lib/sqlite/config.mk b/lib/sqlite/config.mk
index b0e9390f11..a3b52bd4b4 100644
--- a/lib/sqlite/config.mk
+++ b/lib/sqlite/config.mk
@@ -3,18 +3,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-
-# can't do this in manifest.mn because OS_TARGET isn't defined there.
-ifeq (,$(filter-out WIN%,$(OS_TARGET)))
-
-# don't want the 32 in the shared library name
-SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
-
-#RES = $(OBJDIR)/$(LIBRARY_NAME).res
-#RESNAME = $(LIBRARY_NAME).rc
-endif
-
 ifeq ($(OS_TARGET),AIX)
 EXTRA_LIBS += -lpthreads
 ifdef BUILD_OPT
diff --git a/lib/sqlite/manifest.mn b/lib/sqlite/manifest.mn
index be411a6dbb..44422affd6 100644
--- a/lib/sqlite/manifest.mn
+++ b/lib/sqlite/manifest.mn
@@ -8,7 +8,9 @@ MODULE = nss
 
 LIBRARY_NAME = sqlite
 LIBRARY_VERSION = 3
-MAPFILE = $(OBJDIR)/sqlite.def
+MAPFILE = $(OBJDIR)/$(LIBRARY_NAME).def
+RES = $(NULL)
+
 DEFINES += -DSQLITE_THREADSAFE=1
 
 PRIVATE_EXPORTS = \
diff --git a/lib/ssl/config.mk b/lib/ssl/config.mk
index d13613f78c..df4ab35e6f 100644
--- a/lib/ssl/config.mk
+++ b/lib/ssl/config.mk
@@ -9,13 +9,6 @@ endif
 
 ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 
-# don't want the 32 in the shared library name
-SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
-
-RES = $(OBJDIR)/ssl.res
-RESNAME = ssl.rc
-
 ifdef NS_USE_GCC
 EXTRA_SHARED_LIBS += \
 	-L$(DIST)/lib \
diff --git a/lib/ssl/manifest.mn b/lib/ssl/manifest.mn
index ac37c8648c..39e0136410 100644
--- a/lib/ssl/manifest.mn
+++ b/lib/ssl/manifest.mn
@@ -19,7 +19,6 @@ EXPORTS = \
         $(NULL)
 
 MODULE = nss
-MAPFILE = $(OBJDIR)/ssl.def
 
 CSRCS = \
         dtlscon.c \
@@ -66,6 +65,7 @@ CSRCS = \
 
 LIBRARY_NAME = ssl
 LIBRARY_VERSION = 3
+MAPFILE = $(OBJDIR)/$(LIBRARY_NAME).def
 
 # This part of the code, including all sub-dirs, can be optimized for size
 export ALLOW_OPT_CODE_SIZE = 1
diff --git a/lib/sysinit/config.mk b/lib/sysinit/config.mk
index 037641b11a..33ef6e8740 100644
--- a/lib/sysinit/config.mk
+++ b/lib/sysinit/config.mk
@@ -11,13 +11,6 @@
 # can't do this in manifest.mn because OS_TARGET isn't defined there.
 ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 
-# don't want the 32 in the shared library name
-SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
-
-RES = $(OBJDIR)/$(LIBRARY_NAME).res
-RESNAME = $(LIBRARY_NAME).rc
-
 ifdef NS_USE_GCC
 EXTRA_SHARED_LIBS += \
 	-L$(DIST)/lib \
diff --git a/lib/sysinit/manifest.mn b/lib/sysinit/manifest.mn
index 40a119e994..d188b0a51c 100644
--- a/lib/sysinit/manifest.mn
+++ b/lib/sysinit/manifest.mn
@@ -11,7 +11,7 @@ CSRCS = \
       $(NULL)
 
 LIBRARY_NAME = nsssysinit
-MAPFILE = $(OBJDIR)/nsssysinit.def
+MAPFILE = $(OBJDIR)/$(LIBRARY_NAME).def
 
 # This part of the code, including all sub-dirs, can be optimized for size
 export ALLOW_OPT_CODE_SIZE = 1
diff --git a/lib/util/config.mk b/lib/util/config.mk
index a3e720218e..af42a2ee9e 100644
--- a/lib/util/config.mk
+++ b/lib/util/config.mk
@@ -6,13 +6,6 @@
 # can't do this in manifest.mn because OS_TARGET isn't defined there.
 ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 
-# don't want the 32 in the shared library name
-SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
-
-RES = $(OBJDIR)/$(LIBRARY_NAME).res
-RESNAME = $(LIBRARY_NAME).rc
-
 ifdef NS_USE_GCC
 EXTRA_SHARED_LIBS += \
 	-L$(DIST)/lib \
diff --git a/lib/util/manifest.mn b/lib/util/manifest.mn
index b33a2049d5..43eead61c3 100644
--- a/lib/util/manifest.mn
+++ b/lib/util/manifest.mn
@@ -82,11 +82,9 @@ CSRCS = \
 
 MODULE = nss
 
-# don't duplicate module name in REQUIRES
-MAPFILE = $(OBJDIR)/nssutil.def
-
 LIBRARY_NAME = nssutil
 LIBRARY_VERSION = 3
+MAPFILE = $(OBJDIR)/$(LIBRARY_NAME).def
 
 # This part of the code, including all sub-dirs, can be optimized for size
 export ALLOW_OPT_CODE_SIZE = 1