diff --git a/mozilla/Makefile.in b/mozilla/Makefile.in
index 8f160625f05..ee4101417c3 100644
--- a/mozilla/Makefile.in
+++ b/mozilla/Makefile.in
@@ -124,12 +124,12 @@ ifdef MOZ_JPROF
 DIRS        += tools/jprof
 endif
 
-DIRS		+= xpinstall
-
 ifdef MOZ_BUILD_XPFE
 DIRS		+= xpfe
 endif
 
+DIRS		+= xpinstall
+
 ifdef MOZ_PSM
 DIRS		+= security/nss security/manager
 endif
@@ -160,8 +160,6 @@ ifdef MOZ_STATIC_COMPONENTS
 DIRS   += modules/staticmod
 endif
 
-DIRS	+= xpfe/bootstrap
-
 endif # BUILD_MODULES == all
 
 STATIC_MAKEFILES := $(NSPRPUB_DIR) directory/c-sdk/ldap
diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk
index 173463ceffe..a66cc3e6f1b 100644
--- a/mozilla/config/config.mk
+++ b/mozilla/config/config.mk
@@ -378,7 +378,7 @@ endif
 
 DEPENDENCIES	= .md
 
-MOZ_COMPONENT_LIBS=$(MOZ_COMPONENT_XPCOM_LIBS) $(MOZ_COMPONENT_NSPR_LIBS)
+MOZ_COMPONENT_LIBS=$(MOZ_COMPONENT_NSPR_LIBS) $(MOZ_COMPONENT_XPCOM_LIBS)
 
 ifdef GC_LEAK_DETECTOR
 MOZ_COMPONENT_XPCOM_LIBS += -lboehm
diff --git a/mozilla/modules/plugin/default/unix/Makefile.in b/mozilla/modules/plugin/default/unix/Makefile.in
index c297e29132c..26829cd0d30 100644
--- a/mozilla/modules/plugin/default/unix/Makefile.in
+++ b/mozilla/modules/plugin/default/unix/Makefile.in
@@ -62,9 +62,7 @@ CFLAGS		+= $(TK_CFLAGS)
 endif
 
 install-plugin: $(SHARED_LIBRARY)
-ifdef SHARED_LIBRARY
 	$(INSTALL) $(SHARED_LIBRARY) $(DIST)/bin/plugins
-endif
 
 install:: install-plugin
 
diff --git a/mozilla/modules/plugin/samples/default/unix/Makefile.in b/mozilla/modules/plugin/samples/default/unix/Makefile.in
index c297e29132c..26829cd0d30 100644
--- a/mozilla/modules/plugin/samples/default/unix/Makefile.in
+++ b/mozilla/modules/plugin/samples/default/unix/Makefile.in
@@ -62,9 +62,7 @@ CFLAGS		+= $(TK_CFLAGS)
 endif
 
 install-plugin: $(SHARED_LIBRARY)
-ifdef SHARED_LIBRARY
 	$(INSTALL) $(SHARED_LIBRARY) $(DIST)/bin/plugins
-endif
 
 install:: install-plugin
 
diff --git a/mozilla/xpfe/Makefile.in b/mozilla/xpfe/Makefile.in
index 7e68ec316b0..03b0ac456c2 100644
--- a/mozilla/xpfe/Makefile.in
+++ b/mozilla/xpfe/Makefile.in
@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= appshell components browser communicator global
+DIRS            = appshell bootstrap browser communicator components global
 
 include $(topsrcdir)/config/rules.mk