diff --git a/mozilla/netwerk/build/Makefile.in b/mozilla/netwerk/build/Makefile.in
index c5da7d0d364..8c2ecb95ce7 100644
--- a/mozilla/netwerk/build/Makefile.in
+++ b/mozilla/netwerk/build/Makefile.in
@@ -59,6 +59,7 @@ SHARED_LIBRARY_LIBS = \
 		$(DIST)/lib/$(LIB_PREFIX)nkmime_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)nkhttp_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)nkfile_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)nkftp_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)nkdata_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)nkjar_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)nkres_s.$(LIB_SUFFIX) \
@@ -77,6 +78,7 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir)/../cache/src \
 		-I$(srcdir)/../protocol/http/src \
 		-I$(srcdir)/../protocol/file/src \
+		-I$(srcdir)/../protocol/ftp/src \
 		-I$(srcdir)/../protocol/data/src \
 		-I$(srcdir)/../protocol/jar/src \
 		-I$(srcdir)/../protocol/res/src \
diff --git a/mozilla/netwerk/build/nsNetModule.cpp b/mozilla/netwerk/build/nsNetModule.cpp
index efd6dbf0b1d..660bf6593dc 100644
--- a/mozilla/netwerk/build/nsNetModule.cpp
+++ b/mozilla/netwerk/build/nsNetModule.cpp
@@ -177,6 +177,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsAboutCacheEntry)
 
 ///////////////////////////////////////////////////////////////////////////////
 
+#include "nsFtpProtocolHandler.h"
 #include "nsFTPDirListingConv.h"
 #include "nsGopherDirListingConv.h"
 #include "nsMultiMixedConv.h"
@@ -189,6 +190,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsAboutCacheEntry)
 #include "nsBinHexDecoder.h"
 #endif
 
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsFtpProtocolHandler, Init);
+
 nsresult NS_NewFTPDirListingConv(nsFTPDirListingConv** result);
 nsresult NS_NewGopherDirListingConv(nsGopherDirListingConv** result);
 nsresult NS_NewMultiMixedConv (nsMultiMixedConv** result);
@@ -828,6 +831,13 @@ static const nsModuleComponentInfo gNetModuleInfo[] = {
       NS_HTTP_AUTHENTICATOR_CONTRACTID_PREFIX "digest",
       nsHttpDigestAuthConstructor },
 
+    // from netwerk/protocol/ftp:
+    { "The FTP Protocol Handler", 
+      NS_FTPPROTOCOLHANDLER_CID,
+      NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "ftp",
+      nsFtpProtocolHandlerConstructor
+    },
+
     // from netwerk/protocol/data:
     { "Data Protocol Handler", 
       NS_DATAHANDLER_CID,
diff --git a/mozilla/netwerk/build2/Makefile.in b/mozilla/netwerk/build2/Makefile.in
index 9084d9bdf64..a12f472b74f 100644
--- a/mozilla/netwerk/build2/Makefile.in
+++ b/mozilla/netwerk/build2/Makefile.in
@@ -43,13 +43,11 @@ CPPSRCS		= nsNetModule2.cpp
 
 SHARED_LIBRARY_LIBS = \
 		$(DIST)/lib/$(LIB_PREFIX)nkgopher_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/$(LIB_PREFIX)nkftp_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)nkviewsource_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../protocol/gopher/src \
-		-I$(srcdir)/../protocol/ftp/src \
 		-I$(srcdir)/../protocol/viewsource/src \
 		$(NULL)
 
diff --git a/mozilla/netwerk/build2/nsNetModule2.cpp b/mozilla/netwerk/build2/nsNetModule2.cpp
index b808cd02dee..3b42f41e090 100644
--- a/mozilla/netwerk/build2/nsNetModule2.cpp
+++ b/mozilla/netwerk/build2/nsNetModule2.cpp
@@ -38,11 +38,8 @@
 #include "nsIGenericFactory.h"
 
 #include "nsGopherHandler.h"
-#include "nsFtpProtocolHandler.h"
 #include "nsViewSourceHandler.h"
 
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsFtpProtocolHandler, Init);
-
 ///////////////////////////////////////////////////////////////////////////////
 // Module implementation for the net library
 
@@ -54,13 +51,6 @@ static const nsModuleComponentInfo gNetModuleInfo[] = {
       nsGopherHandler::Create
     },
 
-    // from netwerk/protocol/ftp:
-    { "The FTP Protocol Handler", 
-      NS_FTPPROTOCOLHANDLER_CID,
-      NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "ftp",
-      nsFtpProtocolHandlerConstructor
-    },
-
     // from netwerk/protocol/viewsource:
     { "The ViewSource Protocol Handler", 
       NS_VIEWSOURCEHANDLER_CID,
diff --git a/mozilla/netwerk/protocol/ftp/public/Makefile.in b/mozilla/netwerk/protocol/ftp/public/Makefile.in
index 776bf661918..9282a08c125 100644
--- a/mozilla/netwerk/protocol/ftp/public/Makefile.in
+++ b/mozilla/netwerk/protocol/ftp/public/Makefile.in
@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= necko2
+MODULE		= necko
 XPIDL_MODULE	= necko_ftp
 GRE_MODULE	= 1
 
diff --git a/mozilla/netwerk/protocol/ftp/src/Makefile.in b/mozilla/netwerk/protocol/ftp/src/Makefile.in
index ea8c33fad15..2a1be328ad2 100644
--- a/mozilla/netwerk/protocol/ftp/src/Makefile.in
+++ b/mozilla/netwerk/protocol/ftp/src/Makefile.in
@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= necko2
+MODULE		= necko
 LIBRARY_NAME	= nkftp_s
 REQUIRES	= xpcom \
 		  string \