diff --git a/mozilla/allmakefiles.sh b/mozilla/allmakefiles.sh
index 7e8b236aef1..970152dd808 100755
--- a/mozilla/allmakefiles.sh
+++ b/mozilla/allmakefiles.sh
@@ -989,7 +989,7 @@ fi
 
 if [ "$MOZ_STATIC_COMPONENTS" ]; then
     MAKEFILES_static_components="$MAKEFILES_static_components
-	modules/staticmod
+	modules/staticmod/Makefile
 "
 fi
 
@@ -1096,6 +1096,7 @@ $MAKEFILES_plugin
 $MAKEFILES_netwerk
 $MAKEFILES_profile
 $MAKEFILES_rdf
+$MAKEFILES_static_components
 $MAKEFILES_sun_java
 $MAKEFILES_themes
 $MAKEFILES_uriloader
diff --git a/mozilla/config/autoconf.mk.in b/mozilla/config/autoconf.mk.in
index 552cc4ed676..537b65ffa8d 100644
--- a/mozilla/config/autoconf.mk.in
+++ b/mozilla/config/autoconf.mk.in
@@ -74,6 +74,7 @@ NO_SHARED_LIB	= @NO_SHARED_LIB@
 NO_NETSCAPE_SHARED = @NO_SHARED_LIB@
 NO_STATIC_LIB	= @NO_STATIC_LIB@
 NO_NETSCAPE_STATIC = @NO_STATIC_LIB@
+MOZ_STATIC_COMPONENTS = @MOZ_STATIC_COMPONENTS@
 ENABLE_TESTS	= @ENABLE_TESTS@
 IBMBIDI = @IBMBIDI@
 BUILD_IDLC = @BUILD_IDLC@
diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk
index a720e32c9a6..33073aab07f 100644
--- a/mozilla/config/config.mk
+++ b/mozilla/config/config.mk
@@ -222,6 +222,14 @@ endif
 OS_CFLAGS += $(DEBUG_FLAGS)
 OS_CXXFLAGS += $(DEBUG_FLAGS)
 
+ifneq (,$(IS_COMPONENT))
+ifneq (, $(findstring $(LIBRARY_NAME), $(MOZ_STATIC_COMPONENTS)))
+DEFINES	+= -DNSGetModule=$(LIBRARY_NAME)_NSGetModule -DNSGetModule_components=$(LIBRARY_NAME)_NSGM_comps -DNSGetModule_components_count=$(LIBRARY_NAME)_NSGM_comp_count
+NO_STATIC_LIB=
+NO_SHARED_LIB=1
+endif
+endif
+
 #
 # Personal makefile customizations go in these optional make include files.
 #
diff --git a/mozilla/configure.in b/mozilla/configure.in
index ae6330c4dc4..66528278c83 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -3977,6 +3977,7 @@ AC_SUBST(UNIX_CRASH_ON_ASSERT)
 AC_SUBST(NO_UNIX_ASYNC_DNS)
 AC_SUBST(NO_SHARED_LIB)
 AC_SUBST(NO_STATIC_LIB)
+AC_SUBST(MOZ_STATIC_COMPONENTS)
 AC_SUBST(ENABLE_TESTS)
 AC_SUBST(IBMBIDI)
 AC_SUBST(MOZ_USER_DIR)
diff --git a/mozilla/modules/staticmod/nsStaticModule.cpp.in b/mozilla/modules/staticmod/nsStaticModule.cpp.in
index 2c63d1f2aac..e7ea1099b30 100644
--- a/mozilla/modules/staticmod/nsStaticModule.cpp.in
+++ b/mozilla/modules/staticmod/nsStaticModule.cpp.in
@@ -95,7 +95,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsStaticModuleImpl)
 static NS_METHOD nsStaticModuleRegistrationProc(nsIComponentManager *aCompMgr,
                                           nsIFile *aPath,
                                           const char *registryLocation,
-                                          const char *componentType)
+                                          const char *componentType,
+                                          const nsModuleComponentInfo *info)
 {
     NS_RegisterStaticModules(aPath);
     return NS_OK;
@@ -103,7 +104,8 @@ static NS_METHOD nsStaticModuleRegistrationProc(nsIComponentManager *aCompMgr,
 
 static NS_METHOD nsStaticModuleUnregistrationProc(nsIComponentManager *aCompMgr,
                                             nsIFile *aPath,
-                                            const char *registryLocation)
+                                            const char *registryLocation,
+                                            const nsModuleComponentInfo *info)
 {
     return NS_OK;
 }