diff --git a/editor/libeditor/build/Makefile.in b/editor/libeditor/build/Makefile.in
index 9172ef239a4..094613eb209 100644
--- a/editor/libeditor/build/Makefile.in
+++ b/editor/libeditor/build/Makefile.in
@@ -55,9 +55,6 @@ REQUIRES	= xpcom \
 		  appshell \
 		  xuldoc \
 		  commandhandler \
-		  gfx \
-		  widget \
-		  txtsvc \
 		  $(NULL)
 
 ifdef MOZ_PLAINTEXT_EDITOR_ONLY
@@ -74,7 +71,6 @@ else
 CPPSRCS = nsEditorRegistration.cpp
 SHARED_LIBRARY_LIBS = \
 		../html/$(LIB_PREFIX)htmleditor_s.$(LIB_SUFFIX)      \
-		../../txtsvc/src/$(LIB_PREFIX)txtsvc_s.$(LIB_SUFFIX) \
 		$(NULL)
 #		../composer/src/$(LIB_PREFIX)composer_s.$(LIB_SUFFIX)    
 endif
@@ -98,6 +94,5 @@ include $(topsrcdir)/config/rules.mk
 INCLUDES        += -I$(topsrcdir)/editor/libeditor/base \
                    -I$(topsrcdir)/editor/libeditor/text \
                    -I$(topsrcdir)/editor/libeditor/html \
-                   -I$(topsrcdir)/editor/txtsvc/src \
                    -I$(topsrcdir)/editor/composer/src
 
diff --git a/editor/libeditor/build/nsEditorRegistration.cpp b/editor/libeditor/build/nsEditorRegistration.cpp
index e02b7a09722..0dda8339c60 100644
--- a/editor/libeditor/build/nsEditorRegistration.cpp
+++ b/editor/libeditor/build/nsEditorRegistration.cpp
@@ -46,9 +46,6 @@
 
 #include "nsEditorController.h" //CID
 
-#include "nsTextServicesDocument.h"
-#include "nsTextServicesCID.h"
-
 ////////////////////////////////////////////////////////////////////////
 // Define the contructor function for the objects
 //
@@ -58,7 +55,6 @@
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsEditorService)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsPlaintextEditor)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsEditorController)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsTextServicesDocument)
 
 #ifdef ENABLE_EDITOR_API_LOG
 #include "nsHTMLEditorLog.h"
@@ -95,9 +91,6 @@ static const nsModuleComponentInfo components[] = {
     { "Editor Controller", NS_EDITORCONTROLLER_CID,
       "@mozilla.org/editor/editorcontroller;1",
       nsEditorControllerConstructor, },
-    { NULL, NS_TEXTSERVICESDOCUMENT_CID,
-      "@mozilla.org/textservices/textservicesdocument;1",
-      nsTextServicesDocumentConstructor },
 };
 
 ////////////////////////////////////////////////////////////////////////
diff --git a/editor/txtsvc/src/Makefile.in b/editor/txtsvc/src/Makefile.in
index 3fcc9ca1ff5..5704503456f 100644
--- a/editor/txtsvc/src/Makefile.in
+++ b/editor/txtsvc/src/Makefile.in
@@ -27,9 +27,9 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= txtsvc
-LIBRARY_NAME	= txtsvc_s
+LIBRARY_NAME	= txtsvc
 EXPORT_LIBRARY = 1
-FORCE_STATIC_LIB = 1
+IS_COMPONENT	= 1
 MODULE_NAME	= nsTextServicesModule
 REQUIRES	= xpcom \
 		  string \
@@ -44,10 +44,10 @@ REQUIRES	= xpcom \
 
 CPPSRCS		= \
 		nsTextServicesDocument.cpp \
+		nsTextServicesFactory.cpp \
 		nsTSDNotifier.cpp \
 		$(NULL)
 
-
 EXTRA_DSO_LDOPTS = \
 		$(MOZ_UNICHARUTIL_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \