diff --git a/allmakefiles.sh b/allmakefiles.sh
index 6497ac6604a6..acac7f8994a4 100755
--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@@ -92,6 +92,7 @@ dom/src/html/Makefile
 dom/src/jsurl/Makefile
 dom/tools/Makefile
 editor/Makefile
+editor/base/Makefile
 editor/public/Makefile
 editor/idl/Makefile
 editor/txmgr/Makefile
@@ -102,6 +103,17 @@ editor/txmgr/tests/Makefile
 editor/txtsvc/Makefile
 editor/txtsvc/public/Makefile
 editor/txtsvc/src/Makefile
+editor/ui/Makefile
+editor/ui/composer/Makefile
+editor/ui/composer/content/Makefile
+editor/ui/composer/skin/Makefile
+editor/ui/composer/locale/Makefile
+editor/ui/composer/locale/en-US/Makefile
+editor/ui/dialogs/Makefile
+editor/ui/dialogs/content/Makefile
+editor/ui/dialogs/skin/Makefile
+editor/ui/dialogs/locale/Makefile
+editor/ui/dialogs/locale/en-US/Makefile
 expat/Makefile
 expat/xmlparse/Makefile
 expat/xmltok/Makefile
@@ -596,23 +608,6 @@ xpfe/global/resources/locale/unix/Makefile
 # xpfe/browser/public/Makefile
 END_NGMAKEFILES
 
-if [ "$MOZ_EDITOR" ]; then
-  add_makefiles <<END_EDITOR_MAKEFILES
-editor/base/Makefile
-editor/ui/Makefile
-editor/ui/composer/Makefile
-editor/ui/composer/content/Makefile
-editor/ui/composer/skin/Makefile
-editor/ui/composer/locale/Makefile
-editor/ui/composer/locale/en-US/Makefile
-editor/ui/dialogs/Makefile
-editor/ui/dialogs/content/Makefile
-editor/ui/dialogs/skin/Makefile
-editor/ui/dialogs/locale/Makefile
-editor/ui/dialogs/locale/en-US/Makefile
-END_EDITOR_MAKEFILES
-fi
-
 if [ "$MOZ_MAIL_NEWS" ]; then
   add_makefiles < ${srcdir}/mailnews/makefiles
 fi
diff --git a/build/autoconf/clean-config.sh b/build/autoconf/clean-config.sh
index 5924d3445791..c9d79686ce15 100755
--- a/build/autoconf/clean-config.sh
+++ b/build/autoconf/clean-config.sh
@@ -44,11 +44,6 @@ if [ -f mailnews/makefiles ]; then
   export MOZ_MAIL_NEWS
 fi
 
-if [ -d editor ]; then
-  MOZ_EDITOR=1
-  export MOZ_EDITOR
-fi
-
 . allmakefiles.sh
 
 rm -fr $MAKEFILES \
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 9c17a6077fdb..1e0f3ea2369b 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -55,7 +55,6 @@ DETECT_WEBSHELL_LEAKS = @DETECT_WEBSHELL_LEAKS@
 BUILD_PROFILE	= @MOZILLA_GPROF@
 GC_LEAK_DETECTOR = @GC_LEAK_DETECTOR@
 MOZ_MAIL_NEWS	= @MOZ_MAIL_NEWS@
-MOZ_EDITOR	= @MOZ_EDITOR@
 MOZ_BRPROF      = @MOZ_BRPROF@
 NO_UNIX_ASYNC_DNS = @NO_UNIX_ASYNC_DNS@
 NO_SHARED_LIB	= @NO_SHARED_LIB@
diff --git a/configure.in b/configure.in
index c73871f39de7..ca340d4a526d 100644
--- a/configure.in
+++ b/configure.in
@@ -2146,12 +2146,6 @@ MOZ_ARG_DISABLE_BOOL(build-xpfe,
 [  --disable-build-xpfe    Disable building of mozilla/xpfe (BROKEN)],
   MOZ_BUILD_XPFE= )
 
-dnl build editor by default
-MOZ_EDITOR=1
-MOZ_ARG_DISABLE_BOOL(editor,
-[  --disable-editor        Disable building of editor component],
-  MOZ_EDITOR= )
-
 dnl build Mail & News by default
 MOZ_MAIL_NEWS=1
 MOZ_ARG_DISABLE_BOOL(mailnews,
@@ -2785,7 +2779,6 @@ AC_SUBST(MOZ_INSURE_EXCLUDE_DIRS)
 AC_SUBST(MOZ_INSURIFYING)
 AC_SUBST(MOZ_BUILD_XPFE)
 dnl AC_SUBST(MOZ_LDAP)
-AC_SUBST(MOZ_EDITOR)
 AC_SUBST(MOZ_BRPROF)
 
 AC_SUBST(UNIX_CRASH_ON_ASSERT)
@@ -3116,10 +3109,6 @@ fi
 AC_DEFINE(JS_THREADSAFE)
 AC_DEFINE(LAYERS)
 
-if test "$MOZ_EDITOR"; then
-  AC_DEFINE(NGEDITOR)
-fi
-
 # Used for LD_LIBRARY_PATH of run_viewer target
 LIBS_PATH=
 for lib_arg in $NSPR_LIBS $TK_LIBS; do
diff --git a/editor/Makefile.in b/editor/Makefile.in
index 7fecbb73297e..eb69813f19c7 100644
--- a/editor/Makefile.in
+++ b/editor/Makefile.in
@@ -26,13 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= public idl
-
-ifdef MOZ_EDITOR
-DIRS		+= base ui
-endif
-
-DIRS		+= txmgr txtsvc
+DIRS		= public idl base ui txmgr txtsvc
 
 include $(topsrcdir)/config/rules.mk