diff --git a/mozilla/rdf/build/nsRDFCID.h b/mozilla/rdf/build/nsRDFCID.h
index 2a5922ea611..fe90c707c53 100644
--- a/mozilla/rdf/build/nsRDFCID.h
+++ b/mozilla/rdf/build/nsRDFCID.h
@@ -128,4 +128,10 @@
 #define NS_XULELEMENTFACTORY_CID \
 { 0x76e92881, 0xcddb, 0x11d3, { 0xbf, 0x87, 0x0, 0x10, 0x5a, 0x1b, 0x6, 0x27 } }
 
+
+// {508f5601-e09b-11d3-9f7e-cf931f9f173c}
+#define NS_CONTROLLERCOMMANDMANAGER_CID \
+{ 0x508f5601, 0xe09b, 0x11d3, { 0x9f, 0x7e, 0xcf, 0x93, 0x1f, 0x9f, 0x17, 0x3c } }
+
+
 #endif // nsRDFCID_h__
diff --git a/mozilla/rdf/build/nsRDFModule.cpp b/mozilla/rdf/build/nsRDFModule.cpp
index 36959a5f83a..ad30b8c0234 100644
--- a/mozilla/rdf/build/nsRDFModule.cpp
+++ b/mozilla/rdf/build/nsRDFModule.cpp
@@ -48,6 +48,7 @@
 #include "nsIXULKeyListener.h"
 #include "nsIServiceManager.h"
 #include "nsIElementFactory.h"
+#include "nsIControllerCommand.h"
 
 extern nsresult NS_NewXULElementFactory(nsIElementFactory** aResult);
 
@@ -107,6 +108,7 @@ MAKE_CTOR(XULContentSink,XULContentSink,XULContentSink)
 MAKE_CTOR(RDFDefaultResource,DefaultResource,RDFResource)
 MAKE_CTOR(LocalStore,LocalStore,LocalStore)
 
+MAKE_CTOR(ControllerCommandManager,ControllerCommandManager,ControllerCommandManager)
 
 // The list of components we register
 static nsModuleComponentInfo components[] = 
@@ -235,6 +237,12 @@ static nsModuleComponentInfo components[] =
       NS_ELEMENT_FACTORY_PROGID_PREFIX "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
       CreateNewXULElementFactory
     },
+
+    { "Controller Command Manager",
+      NS_CONTROLLERCOMMANDMANAGER_CID,
+      NS_RDF_PROGID "/controller-command-manager",
+      CreateNewControllerCommandManager
+    },
 };
 
 NS_IMPL_NSGETMODULE("nsRDFModule", components);
diff --git a/mozilla/rdf/content/src/Makefile.in b/mozilla/rdf/content/src/Makefile.in
index b01ef9b7241..383cffb7c72 100644
--- a/mozilla/rdf/content/src/Makefile.in
+++ b/mozilla/rdf/content/src/Makefile.in
@@ -33,6 +33,7 @@ REQUIRES	= dom js netlib rdf raptor xpcom locale
 
 CPPSRCS		= \
 		nsElementMap.cpp \
+		nsControllerCommandManager.cpp \
 		nsJSXULDocument.cpp \
 		nsJSXULElement.cpp \
 		nsJSXULCommandDispatcher.cpp \
diff --git a/mozilla/rdf/content/src/makefile.win b/mozilla/rdf/content/src/makefile.win
index 3dba419c301..7d3a35700fa 100644
--- a/mozilla/rdf/content/src/makefile.win
+++ b/mozilla/rdf/content/src/makefile.win
@@ -32,20 +32,21 @@ LCFLAGS = \
 
 CPP_OBJS=\
         .\$(OBJDIR)\nsElementMap.obj              \
-	.\$(OBJDIR)\nsJSXULCommandDispatcher.obj  \
-	.\$(OBJDIR)\nsRDFGenericBuilder.obj       \
-	.\$(OBJDIR)\nsXULAttributes.obj		  \
-	.\$(OBJDIR)\nsXULCommandDispatcher.obj    \
-	.\$(OBJDIR)\nsXULControllers.obj    \
-	.\$(OBJDIR)\nsXULPopupListener.obj        \
+        .\$(OBJDIR)\nsControllerCommandManager.obj \
+        .\$(OBJDIR)\nsJSXULCommandDispatcher.obj  \
+        .\$(OBJDIR)\nsRDFGenericBuilder.obj       \
+        .\$(OBJDIR)\nsXULAttributes.obj		        \
+        .\$(OBJDIR)\nsXULCommandDispatcher.obj    \
+        .\$(OBJDIR)\nsXULControllers.obj          \
+        .\$(OBJDIR)\nsXULPopupListener.obj        \
         .\$(OBJDIR)\nsXULPrototypeDocument.obj    \
         .\$(OBJDIR)\nsXULPrototypeCache.obj       \
         .\$(OBJDIR)\nsJSXULDocument.obj           \
         .\$(OBJDIR)\nsJSXULElement.obj            \
-		.\$(OBJDIR)\nsJSXULPopupElement.obj            \
+        .\$(OBJDIR)\nsJSXULPopupElement.obj       \
         .\$(OBJDIR)\nsJSXULTreeElement.obj        \
         .\$(OBJDIR)\nsJSXULIFrameElement.obj      \
-        .\$(OBJDIR)\nsJSXULBrowserElement.obj      \
+        .\$(OBJDIR)\nsJSXULBrowserElement.obj     \
         .\$(OBJDIR)\nsJSXULEditorElement.obj      \
         .\$(OBJDIR)\nsRDFDOMNodeList.obj          \
         .\$(OBJDIR)\nsXULElement.obj              \
@@ -56,9 +57,9 @@ CPP_OBJS=\
         .\$(OBJDIR)\nsXULSortService.obj          \
         .\$(OBJDIR)\nsXULTreeElement.obj          \
         .\$(OBJDIR)\nsXULIFrameElement.obj        \
-        .\$(OBJDIR)\nsXULBrowserElement.obj        \
+        .\$(OBJDIR)\nsXULBrowserElement.obj       \
         .\$(OBJDIR)\nsXULEditorElement.obj        \
-		.\$(OBJDIR)\nsXULPopupElement.obj         \
+        .\$(OBJDIR)\nsXULPopupElement.obj         \
 	$(NULL)
 
 # XXX we are including layout\html\base\src to get HTML elements
diff --git a/mozilla/rdf/macbuild/rdf.mcp b/mozilla/rdf/macbuild/rdf.mcp
index 9ed0c6d566a..4b0b87c3ff9 100644
Binary files a/mozilla/rdf/macbuild/rdf.mcp and b/mozilla/rdf/macbuild/rdf.mcp differ