diff --git a/Products/LDAPMultiPlugins/CHANGES.txt b/Products/LDAPMultiPlugins/CHANGES.txt
index e0d7c3f..9e33214 100644
--- a/Products/LDAPMultiPlugins/CHANGES.txt
+++ b/Products/LDAPMultiPlugins/CHANGES.txt
@@ -6,6 +6,10 @@ To see earlier changes please see HISTORY.txt.
 1.8 (unreleased)
 ----------------
 
+- Bug: Move plugin registration from initialize method to module level to
+  avoid multiple registrations.
+  (http://www.dataflake.org/tracker/issue_00631 by Ramon Navarro Bosch)
+
 - Feature: Implemented GenericSetup import/export handlers and registered
   import/export steps.
 
diff --git a/Products/LDAPMultiPlugins/COPYRIGHT.txt b/Products/LDAPMultiPlugins/COPYRIGHT.txt
index 41b5e79..ad46690 100644
--- a/Products/LDAPMultiPlugins/COPYRIGHT.txt
+++ b/Products/LDAPMultiPlugins/COPYRIGHT.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2008 Jens Vagelpohl and contributors.
+Copyright (c) 2004-2009 Jens Vagelpohl and contributors.
 All Rights Reserved.
 
 This software is subject to the provisions of the Zope Public License,
diff --git a/Products/LDAPMultiPlugins/__init__.py b/Products/LDAPMultiPlugins/__init__.py
index 1e0f57e..85cc4eb 100644
--- a/Products/LDAPMultiPlugins/__init__.py
+++ b/Products/LDAPMultiPlugins/__init__.py
@@ -10,7 +10,7 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-""" LDAPMultiPlugin product initialization
+""" LDAPMultiPlugins product initialization
 
 $Id$
 """
@@ -18,17 +18,23 @@ $Id$
 from AccessControl.Permissions import add_user_folders
 from Products.PluggableAuthService.PluggableAuthService import \
         registerMultiPlugin
-from LDAPMultiPlugin import LDAPMultiPlugin, \
-                            manage_addLDAPMultiPlugin, \
-                            addLDAPMultiPluginForm
-from ActiveDirectoryMultiPlugin import ActiveDirectoryMultiPlugin, \
-                            manage_addActiveDirectoryMultiPlugin, \
-                            addActiveDirectoryMultiPluginForm
+
+from Products.LDAPMultiPlugins.LDAPMultiPlugin import addLDAPMultiPluginForm
+from Products.LDAPMultiPlugins.LDAPMultiPlugin import LDAPMultiPlugin
+from Products.LDAPMultiPlugins.LDAPMultiPlugin import manage_addLDAPMultiPlugin
+from Products.LDAPMultiPlugins.ActiveDirectoryMultiPlugin import \
+    ActiveDirectoryMultiPlugin
+from Products.LDAPMultiPlugins.ActiveDirectoryMultiPlugin import \
+    addActiveDirectoryMultiPluginForm
+from Products.LDAPMultiPlugins.ActiveDirectoryMultiPlugin import \
+    manage_addActiveDirectoryMultiPlugin
+
+registerMultiPlugin(LDAPMultiPlugin.meta_type)
+registerMultiPlugin(ActiveDirectoryMultiPlugin.meta_type)
 
 def initialize(context):
-    """ Initialize the LDAPMultiPlugin """
-    registerMultiPlugin(LDAPMultiPlugin.meta_type)
-    registerMultiPlugin(ActiveDirectoryMultiPlugin.meta_type)
+    """ Initialize the LDAPMultiPlugin 
+    """
 
     context.registerClass( LDAPMultiPlugin
                          , permission=add_user_folders
diff --git a/setup.py b/setup.py
index 411bdf1..7446a63 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ setup(name='Products.%s' % NAME,
       keywords='web application server zope zope2 ldap',
       author="Jens Vagelpohl and contributors",
       author_email="jens@dataflake.org",
-      url="http://pypi.python.org/pypi/Products.LDAPMultiPlugins",
+      url="http://pypi.python.org/pypi/Products.%s" % NAME,
       license="ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)",
       packages=find_packages(),
       include_package_data=True,