diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
index 1be67ef442c..c2ee442ed9e 100644
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -65,7 +65,12 @@ REQUIRES = \
 
 CPPSRCS = nsBrowserApp.cpp
 
+ifdef BUILD_STATIC_LIBS
+STATIC_COMPONENTS_LINKER_PATH = -L$(DIST)/lib/components
+endif
+
 LIBS = \
+	$(STATIC_COMPONENTS_LINKER_PATH) \
 	$(EXTRA_DSO_LIBS) \
 	$(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX) \
 	$(MOZ_JS_LIBS) \
diff --git a/xpfe/bootstrap/Makefile.in b/xpfe/bootstrap/Makefile.in
index a085fb98600..700851149e1 100644
--- a/xpfe/bootstrap/Makefile.in
+++ b/xpfe/bootstrap/Makefile.in
@@ -127,8 +127,14 @@ STACKWALK_CPPSRCS := $(addprefix $(topsrcdir)/xpcom/base/, $(STACKWALK_SRC_LCSRC
 CPPSRCS		+= nsSigHandlers.cpp nsStackFrameUnix.cpp
 endif
 
-LIBS	= $(EXTRA_DSO_LIBS) \
-	  $(NULL)
+ifdef BUILD_STATIC_LIBS
+STATIC_COMPONENTS_LINKER_PATH = -L$(DIST)/lib/components
+endif
+
+LIBS	= \
+	$(STATIC_COMPONENTS_LINKER_PATH) \
+	$(EXTRA_DSO_LIBS) \
+	$(NULL)
 
 
 ifndef BUILD_STATIC_LIBS