diff --git a/mozilla/editor/base/makefile.win b/mozilla/editor/base/makefile.win
index 6fc790d54f9..9fa937337cc 100644
--- a/mozilla/editor/base/makefile.win
+++ b/mozilla/editor/base/makefile.win
@@ -27,17 +27,18 @@ LIBRARY_NAME=editor
 
 CPPSRCS =				\
       nsEditor.cpp			     \
-      nsEditorService.cpp \
+      nsEditorService.cpp    \
       nsEditorController.cpp \
       nsEditorCommands.cpp   \
+      nsComposerCommands.cpp \
       nsEditorUtils.cpp      \
-      nsEditorRegistration.cpp \
+      nsEditorRegistration.cpp   \
       nsEditorParserObserver.cpp \
       nsTextEditRules.cpp    \
       nsHTMLEditRules.cpp    \
       nsHTMLEditUtils.cpp    \
       TextEditorTest.cpp     \
-      nsEditorEventListeners.cpp   \
+      nsEditorEventListeners.cpp \
       nsEditProperty.cpp     \
       EditTxn.cpp            \
       EditAggregateTxn.cpp   \
@@ -67,9 +68,10 @@ CPPSRCS =				\
 
 CPP_OBJS =					\
 	.\$(OBJDIR)\nsEditor.obj		        \
-	.\$(OBJDIR)\nsEditorService.obj		        \
+	.\$(OBJDIR)\nsEditorService.obj		  \
 	.\$(OBJDIR)\nsEditorController.obj  \
 	.\$(OBJDIR)\nsEditorCommands.obj	  \
+	.\$(OBJDIR)\nsComposerCommands.obj  \
 	.\$(OBJDIR)\nsEditorUtils.obj		    \
 	.\$(OBJDIR)\nsEditorRegistration.obj \
 	.\$(OBJDIR)\nsEditorParserObserver.obj \
diff --git a/mozilla/editor/ui/composer/content/MANIFEST b/mozilla/editor/ui/composer/content/MANIFEST
index 05bdae196e3..b648d32859c 100644
--- a/mozilla/editor/ui/composer/content/MANIFEST
+++ b/mozilla/editor/ui/composer/content/MANIFEST
@@ -25,6 +25,7 @@
 editor.xul
 TextEditorAppShell.xul
 EditorCommands.js
+ComposerCommands.js
 EditorCommandsDebug.js
 EditorInitPage.html
 EditorInitPagePlain.html
diff --git a/mozilla/editor/ui/composer/content/makefile.win b/mozilla/editor/ui/composer/content/makefile.win
index 6375b8e6d10..ff734558efa 100644
--- a/mozilla/editor/ui/composer/content/makefile.win
+++ b/mozilla/editor/ui/composer/content/makefile.win
@@ -27,6 +27,7 @@ install::
 	$(MAKE_INSTALL) editor.xul         $(DIST)\bin\chrome\editor\content
 	$(MAKE_INSTALL) TextEditorAppShell.xul     $(DIST)\bin\chrome\editor\content
 	$(MAKE_INSTALL) EditorCommands.js          $(DIST)\bin\chrome\editor\content
+	$(MAKE_INSTALL) ComposerCommands.js        $(DIST)\bin\chrome\editor\content
 	$(MAKE_INSTALL) EditorCommandsDebug.js     $(DIST)\bin\chrome\editor\content
 	$(MAKE_INSTALL) EditorInitPage.html        $(DIST)\bin\chrome\editor\content
 	$(MAKE_INSTALL) EditorInitPagePlain.html   $(DIST)\bin\chrome\editor\content
@@ -49,6 +50,7 @@ clobber::
   rm -f $(DIST)\bin\chrome\editor\content\editor.xul
   rm -f $(DIST)\bin\chrome\editor\content\TextEditorAppShell.xul
   rm -f $(DIST)\bin\chrome\editor\content\EditorCommands.js	
+  rm -f $(DIST)\bin\chrome\editor\content\ComposerCommands.js	
   rm -f $(DIST)\bin\chrome\editor\content\EditorCommandsDebug.js	
   rm -f $(DIST)\bin\chrome\editor\content\EditorInitPage.html 
   rm -f $(DIST)\bin\chrome\editor\content\EditorInitPagePlain.html