diff --git a/mozilla/browser/components/build/Makefile.in b/mozilla/browser/components/build/Makefile.in
index e0735813bb7..c2ea5e5cb44 100644
--- a/mozilla/browser/components/build/Makefile.in
+++ b/mozilla/browser/components/build/Makefile.in
@@ -24,6 +24,8 @@ REQUIRES = \
 	uriloader \
 	dom \
 	necko \
+  nkcache \
+  txmgr \
 	webbrowserpersist \
 	progressDlg \
 	mimetype \
@@ -34,18 +36,23 @@ EXPORTS = nsBrowserCompsCID.h
 CPPSRCS = nsModule.cpp \
           $(NULL)
 
+OS_LIBS	+= $(call EXPAND_LIBNAME,ole32 shell32)
+
 LOCAL_INCLUDES = \
 	-I$(srcdir)/../downloads/src \
+  -I$(srcdir)/../bookmarks/src \
 	$(NULL)
 
 SHARED_LIBRARY_LIBS = \
 	$(DIST)/lib/$(LIB_PREFIX)download_s.$(LIB_SUFFIX) \
+  $(DIST)/lib/$(LIB_PREFIX)bookmarks_s.$(LIB_SUFFIX) \
 	$(NULL)
 
 EXTRA_DSO_LDOPTS += \
 	$(EXTRA_DSO_LIBS) \
 	$(MOZ_UNICHARUTIL_LIBS) \
 	$(MOZ_COMPONENT_LIBS) \
+  $(MOZ_XPCOM_OBSOLETE_LIBS) \
 	$(MOZ_JS_LIBS) \
 	$(NULL)
 
diff --git a/mozilla/browser/components/build/nsModule.cpp b/mozilla/browser/components/build/nsModule.cpp
index 8a3fd954d49..ca650b3a2ff 100644
--- a/mozilla/browser/components/build/nsModule.cpp
+++ b/mozilla/browser/components/build/nsModule.cpp
@@ -41,16 +41,22 @@
 #include "nsBrowserCompsCID.h"
 #include "nsDownloadManager.h"
 #include "nsDownloadProxy.h"
+#include "nsBookmarksService.h"
 
 /////////////////////////////////////////////////////////////////////////////
 
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsDownloadManager, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDownloadProxy)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsBookmarksService, Init)
 
 /////////////////////////////////////////////////////////////////////////////
 
 static const nsModuleComponentInfo components[] =
 {
+  { "Bookmarks", NS_BOOKMARKS_SERVICE_CID, NS_BOOKMARKS_SERVICE_CONTRACTID,
+      nsBookmarksServiceConstructor },
+    { "Bookmarks", NS_BOOKMARKS_SERVICE_CID, NS_BOOKMARKS_DATASOURCE_CONTRACTID,
+      nsBookmarksServiceConstructor },
   { "Download Manager",
     NS_DOWNLOADMANAGER_CID,
     NS_DOWNLOADMANAGER_CONTRACTID,