diff --git a/config/nsStaticComponents.cpp.in b/config/nsStaticComponents.cpp.in
new file mode 100644
index 00000000000..a7f848213b8
--- /dev/null
+++ b/config/nsStaticComponents.cpp.in
@@ -0,0 +1,76 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Christopher Seawood <cls@seawood.org>
+ *   Chris Waterson <waterson@netscape.com>
+ *   Benjamin Smedberg <benjamin@smedbergs.us>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#define XPCOM_TRANSLATE_NSGM_ENTRY_POINT 1
+
+#include "nsIGenericFactory.h"
+#include "nsXPCOM.h"
+#include "nsMemory.h"
+#include "nsStaticComponents.h"
+
+/**
+ * Construct a unique NSGetModule entry point for a generic module.
+ */
+#define NSGETMODULE(_name) _name##_NSGetModule
+
+/**
+ * Declare an NSGetModule() routine for a generic module.
+ */
+#define MODULE(_name) \
+NSGETMODULE_ENTRY_POINT(_name) (nsIComponentManager*, nsIFile*, nsIModule**);
+
+%MODULE_LIST%
+#line 57 "nsStaticComponents.cpp.in"
+
+#undef MODULE
+
+
+#define MODULE(_name) { #_name, NSGETMODULE(_name) },
+
+/**
+ * The nsStaticModuleInfo
+ */
+static nsStaticModuleInfo const gStaticModuleInfo[] = {
+	%MODULE_LIST%
+#line 69 "nsStaticComponents.cpp.in"
+};
+
+nsStaticModuleInfo const *const kPStaticModules = gStaticModuleInfo;
+PRUint32 const kStaticModuleCount = NS_ARRAY_LENGTH(gStaticModuleInfo);
diff --git a/config/nsStaticComponents.h b/config/nsStaticComponents.h
new file mode 100644
index 00000000000..ecbb6873b80
--- /dev/null
+++ b/config/nsStaticComponents.h
@@ -0,0 +1,47 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Mozilla Toolkit.
+ *
+ * The Initial Developer of the Original Code is
+ * Benjamin Smedberg <benjamin@smedbergs.us>
+ *
+ * Portions created by the Initial Developer are Copyright (C) 2005
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef nsStaticComponents_h__
+#define nsStaticComponents_h__
+
+// These symbols are provided by nsStaticComponents.cpp, and also by other
+// static component providers such as nsStaticXULComponents (libxul).
+
+extern nsStaticModuleInfo const *const kPStaticModules;
+extern PRUint32 const kStaticModuleCount;
+
+#endif