diff --git a/mozilla/xpfe/components/Makefile.in b/mozilla/xpfe/components/Makefile.in
index 8668e7c02ae..bc72b71096f 100644
--- a/mozilla/xpfe/components/Makefile.in
+++ b/mozilla/xpfe/components/Makefile.in
@@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk
 DIRS	= \
 			bookmarks \
 			directory \
-			download-manager \
 			filepicker \
 			find history \
 			search \
@@ -49,6 +48,10 @@ DIRS	= \
 			windowds \
 			$(NULL)
 
+ifndef MOZ_PHOENIX
+DIRS		+= download-manager
+endif
+
 ifdef MOZ_ENABLE_XREMOTE
 DIRS		+= xremote
 endif
diff --git a/mozilla/xpfe/components/build/Makefile.in b/mozilla/xpfe/components/build/Makefile.in
index dbf0e97679a..419a5f5abda 100644
--- a/mozilla/xpfe/components/build/Makefile.in
+++ b/mozilla/xpfe/components/build/Makefile.in
@@ -72,7 +72,6 @@ SHARED_LIBRARY_LIBS = \
 	$(DIST)/lib/$(LIB_PREFIX)autocomplete_s.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)bookmarks_s.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)directory_s.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)downloadmanager_s.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)history_s.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)appcompintl_s.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)related_s.$(LIB_SUFFIX) \
@@ -83,6 +82,12 @@ SHARED_LIBRARY_LIBS = \
 	$(DIST)/lib/$(LIB_PREFIX)mozbrwsr_s.$(LIB_SUFFIX) \
 	$(NULL)
 
+ifndef MOZ_PHOENIX
+SHARED_LIBRARY_LIBS += \
+	$(DIST)/lib/$(LIB_PREFIX)downloadmanager_s.$(LIB_SUFFIX) \
+	$(NULL)
+endif
+
 LOCAL_INCLUDES	= \
 	-I$(srcdir)/../autocomplete/src  \
 	-I$(srcdir)/../bookmarks/src     \
diff --git a/mozilla/xpfe/components/build/nsModule.cpp b/mozilla/xpfe/components/build/nsModule.cpp
index e6df1f99c61..437ee2815db 100644
--- a/mozilla/xpfe/components/build/nsModule.cpp
+++ b/mozilla/xpfe/components/build/nsModule.cpp
@@ -39,8 +39,10 @@
 #include "nsAutoComplete.h"
 #include "nsBookmarksService.h"
 #include "nsDirectoryViewer.h"
+#ifndef MOZ_PHOENIX
 #include "nsDownloadManager.h"
 #include "nsDownloadProxy.h"
+#endif
 #include "nsGlobalHistory.h"
 #include "rdf.h"
 #include "nsTimeBomb.h"
@@ -71,8 +73,10 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsAutoCompleteResults)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsBookmarksService, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsHTTPIndex, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDirectoryViewerFactory)
+#ifndef MOZ_PHOENIX
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsDownloadManager, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDownloadProxy)
+#endif
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGlobalHistory, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(LocalSearchDataSource, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(InternetSearchDataSource, Init)
@@ -165,10 +169,12 @@ static const nsModuleComponentInfo components[] = {
       nsHTTPIndexConstructor },
     { "Directory Viewer", NS_HTTPINDEX_SERVICE_CID, NS_HTTPINDEX_DATASOURCE_CONTRACTID,
       nsHTTPIndexConstructor },
+#ifndef MOZ_PHOENIX
     { "Download Manager", NS_DOWNLOADMANAGER_CID, NS_DOWNLOADMANAGER_CONTRACTID,
       nsDownloadManagerConstructor },
     { "Download", NS_DOWNLOAD_CID, NS_DOWNLOAD_CONTRACTID,
       nsDownloadProxyConstructor },
+#endif
     { "Global History", NS_GLOBALHISTORY_CID, NS_GLOBALHISTORY_CONTRACTID,
       nsGlobalHistoryConstructor },
     { "Global History", NS_GLOBALHISTORY_CID, NS_GLOBALHISTORY_DATASOURCE_CONTRACTID,