diff --git a/xpfe/components/regviewer/nsRegistryDataSource.cpp b/xpfe/components/regviewer/nsRegistryDataSource.cpp
index 1af9b37ccbb..e2a5d7846e5 100644
--- a/xpfe/components/regviewer/nsRegistryDataSource.cpp
+++ b/xpfe/components/regviewer/nsRegistryDataSource.cpp
@@ -45,10 +45,7 @@
 #include "rdf.h"
 #include "nsCRT.h"
 
-static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
-static NS_DEFINE_CID(kGenericFactoryCID,   NS_GENERICFACTORY_CID);
 static NS_DEFINE_CID(kRDFServiceCID,       NS_RDFSERVICE_CID);
-static NS_DEFINE_CID(kRegistryViewerCID,   NS_REGISTRYVIEWER_CID);
 static NS_DEFINE_CID(kRegistryCID,         NS_REGISTRY_CID);
 
 #define NS_REGISTRY_NAMESPACE_URI "urn:mozilla-registry:"
@@ -860,227 +857,15 @@ nsRegistryDataSource::SubkeyEnumerator::GetNext(nsISupports** _retval)
 }
 
 
+//------------------------------------------------------------------------
+//
 // Module implementation
-class nsRegistryDataSourceModule : public nsIModule
-{
-public:
-    nsRegistryDataSourceModule();
-    virtual ~nsRegistryDataSourceModule();
-
-    NS_DECL_ISUPPORTS
-
-    NS_DECL_NSIMODULE
-
-protected:
-    nsresult Initialize();
-
-    void Shutdown();
-
-    PRBool mInitialized;
-    nsCOMPtr<nsIGenericFactory> mFactory;
-};
-
-//----------------------------------------------------------------------
-
-// Functions used to create new instances of a given object by the
-// generic factory.
-
-
-nsRegistryDataSourceModule::nsRegistryDataSourceModule()
-    : mInitialized(PR_FALSE)
-{
-    NS_INIT_ISUPPORTS();
-}
-
-nsRegistryDataSourceModule::~nsRegistryDataSourceModule()
-{
-    Shutdown();
-}
-
-NS_IMPL_ISUPPORTS(nsRegistryDataSourceModule, NS_GET_IID(nsIModule))
-
-// Perform our one-time intialization for this module
-nsresult
-nsRegistryDataSourceModule::Initialize()
-{
-    if (mInitialized) {
-        return NS_OK;
-    }
-    mInitialized = PR_TRUE;
-    return NS_OK;
-}
-
-// Shutdown this module, releasing all of the module resources
-void
-nsRegistryDataSourceModule::Shutdown()
-{
-    // Release the factory object
-    mFactory = nsnull;
-}
-
-// Create a factory object for creating instances of aClass.
-NS_IMETHODIMP
-nsRegistryDataSourceModule::GetClassObject(nsIComponentManager *aCompMgr,
-                               const nsCID& aClass,
-                               const nsIID& aIID,
-                               void** r_classObj)
-{
-    nsresult rv;
-
-    // Defensive programming: Initialize *r_classObj in case of error below
-    if (!r_classObj) {
-        return NS_ERROR_INVALID_POINTER;
-    }
-    *r_classObj = NULL;
-
-    // Do one-time-only initialization if necessary
-    if (!mInitialized) {
-        rv = Initialize();
-        if (NS_FAILED(rv)) {
-            // Initialization failed! yikes!
-            return rv;
-        }
-    }
-
-    // Choose the appropriate factory, based on the desired instance
-    // class type (aClass).
-    nsCOMPtr<nsIGenericFactory> fact;
-    if (aClass.Equals(kRegistryViewerCID)) {
-        if (!mFactory) {
-            // Create and save away the factory object for creating
-            // new instances of RegistryDataSource. This way if we are called
-            // again for the factory, we won't need to create a new
-            // one.
-            rv = NS_NewGenericFactory(getter_AddRefs(mFactory),
-                                      nsRegistryDataSource::Create);
-        }
-        fact = mFactory;
-    }
-    else {
-        rv = NS_ERROR_FACTORY_NOT_REGISTERED;
-#ifdef DEBUG
-        char* cs = aClass.ToString();
-        printf("+++ nsRegistryDataSourceModule: unable to create factory for %s\n", cs);
-        nsCRT::free(cs);
-#endif
-    }
-
-    if (fact) {
-        rv = fact->QueryInterface(aIID, r_classObj);
-    }
-
-    return rv;
-}
-
-//----------------------------------------
-
-struct Components {
-    const char* mDescription;
-    const nsID* mCID;
-    const char* mProgID;
-};
-
+//
 // The list of components we register
-static Components gComponents[] = {
-    { "Registry Viewer", &kRegistryViewerCID,
-      "component://netscape/registry-viewer", },
+static nsModuleComponentInfo components[] = {
+    { "Registry Viewer", NS_REGISTRYVIEWER_CID,
+      "component://netscape/registry-viewer", nsRegistryDataSource::Create,
+    },
 };
-#define NUM_COMPONENTS (sizeof(gComponents) / sizeof(gComponents[0]))
-
-NS_IMETHODIMP
-nsRegistryDataSourceModule::RegisterSelf(nsIComponentManager *aCompMgr,
-                             nsIFile* aPath,
-                             const char* registryLocation,
-                             const char* componentType)
-{
-    nsresult rv = NS_OK;
-
-#ifdef DEBUG
-    printf("*** Registering RegistryDataSource components\n");
-#endif
-
-    Components* cp = gComponents;
-    Components* end = cp + NUM_COMPONENTS;
-    while (cp < end) {
-        rv = aCompMgr->RegisterComponentSpec(*cp->mCID, cp->mDescription,
-                                             cp->mProgID, aPath, PR_TRUE,
-                                             PR_TRUE);
-        if (NS_FAILED(rv)) {
-#ifdef DEBUG
-            printf("nsRegistryDataSourceModule: unable to register %s component => %x\n",
-                   cp->mDescription, rv);
-#endif
-            break;
-        }
-        cp++;
-    }
-
-    return rv;
-}
-
-NS_IMETHODIMP
-nsRegistryDataSourceModule::UnregisterSelf(nsIComponentManager* aCompMgr,
-                               nsIFile* aPath,
-                               const char* registryLocation)
-{
-#ifdef DEBUG
-    printf("*** Unregistering RegistryDataSource components\n");
-#endif
-    Components* cp = gComponents;
-    Components* end = cp + NUM_COMPONENTS;
-    while (cp < end) {
-        nsresult rv = aCompMgr->UnregisterComponentSpec(*cp->mCID, aPath);
-        if (NS_FAILED(rv)) {
-#ifdef DEBUG
-            printf("nsRegistryDataSourceModule: unable to unregister %s component => %x\n",
-                   cp->mDescription, rv);
-#endif
-        }
-        cp++;
-    }
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsRegistryDataSourceModule::CanUnload(nsIComponentManager *aCompMgr, PRBool *okToUnload)
-{
-    if (!okToUnload) {
-        return NS_ERROR_INVALID_POINTER;
-    }
-    *okToUnload = PR_FALSE;
-    return NS_ERROR_FAILURE;
-}
-
-//----------------------------------------------------------------------
-
-static nsRegistryDataSourceModule *gModule = NULL;
-
-extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr,
-                                          nsIFile* aPath,
-                                          nsIModule** return_cobj)
-{
-    nsresult rv = NS_OK;
-
-    NS_ENSURE_ARG_POINTER(return_cobj);
-    NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE);
-
-    // Create and initialize the module instance
-    nsRegistryDataSourceModule *m = new nsRegistryDataSourceModule();
-    if (!m) {
-        return NS_ERROR_OUT_OF_MEMORY;
-    }
-
-    // Increase refcnt and store away nsIModule interface to m in return_cobj
-    rv = m->QueryInterface(NS_GET_IID(nsIModule), (void**)return_cobj);
-    if (NS_FAILED(rv)) {
-        delete m;
-        m = nsnull;
-    }
-    gModule = m;                  // WARNING: Weak Reference
-    return rv;
-}
-
-
-
 
+NS_IMPL_NSGETMODULE("nsRegistryViewerModule", components)