diff --git a/product/ERP5Wizard/Tool/IntrospectionTool.py b/product/ERP5Wizard/Tool/IntrospectionTool.py
new file mode 100644
index 0000000000000000000000000000000000000000..18d4ddb485703f0282a80f9fb4254cf24280d8a2
--- /dev/null
+++ b/product/ERP5Wizard/Tool/IntrospectionTool.py
@@ -0,0 +1,54 @@
+##############################################################################
+#
+# Copyright (c) 2006 Nexedi SARL and Contributors. All Rights Reserved.
+#                    Ivan Tyagov <ivan@nexedi.com>
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+from AccessControl import ClassSecurityInfo
+from Globals import InitializeClass, DTMLFile
+from Products.ERP5Type.Tool.BaseTool import BaseTool
+from Products.ERP5Type import Permissions
+from Products.ERP5Wizard import _dtmldir
+from AccessControl.SecurityManagement import newSecurityManager, \
+                                             getSecurityManager, setSecurityManager
+import zLOG
+from Products.ERP5Type.Cache import CachingMethod
+
+class IntrospectionTool(BaseTool):
+  """
+ This tool provides both local and  remote introspection.
+  """
+  id = 'portal_introspections'
+  title = 'Introspection Tool'
+
+  meta_type = 'ERP5 Introspection Tool'
+  portal_type = 'Introspection Tool'
+  allowed_content_types = ('Anonymized Introspection Report', 'User Introspection Report', )
+  
+  security = ClassSecurityInfo()
+  security.declareProtected(Permissions.ManagePortal, 'manage_overview')
+  manage_overview = DTMLFile('explainIntrospectionTool', _dtmldir )
+
+InitializeClass(IntrospectionTool)
diff --git a/product/ERP5Wizard/__init__.py b/product/ERP5Wizard/__init__.py
index f187aff5d2c2e0cab465e1d98d49b98cd309e27b..e335b48e9ca083ec577b34a4e68a5c8191e8a5d7 100644
--- a/product/ERP5Wizard/__init__.py
+++ b/product/ERP5Wizard/__init__.py
@@ -31,7 +31,6 @@
 
 from Products.ERP5Type.Utils import initializeProduct, updateGlobals
 import sys, Permissions
-
 from AccessControl.Permissions import manage_users as ManageUsers
 from Products.PluggableAuthService.PluggableAuthService import registerMultiPlugin
 from Products.PluggableAuthService.permissions import ManageGroups
@@ -40,17 +39,16 @@ from Products.ERP5Wizard.PAS.ERP5RemoteUserManager import \
 
 this_module = sys.modules[ __name__ ]
 document_classes = updateGlobals(this_module, globals(), permissions_module=Permissions)
-
-
 registerMultiPlugin(ERP5RemoteUserManager.meta_type)
 
 # Finish installation
 def initialize(context):
   import Document
-  from Tool import WizardTool
+  from Tool import WizardTool, IntrospectionTool
   # Define object classes and tools
   object_classes = ()
-  portal_tools = (WizardTool.WizardTool,)
+  portal_tools = (WizardTool.WizardTool,
+                  IntrospectionTool.IntrospectionTool,)
   content_classes = ()
   content_constructors = ()
   # Do initialization step
diff --git a/product/ERP5Wizard/dtml/explainIntrospectionTool.dtml b/product/ERP5Wizard/dtml/explainIntrospectionTool.dtml
new file mode 100644
index 0000000000000000000000000000000000000000..a03e6ff35e249f2d9d6f5a5fb02064dd34a67d07
--- /dev/null
+++ b/product/ERP5Wizard/dtml/explainIntrospectionTool.dtml
@@ -0,0 +1,9 @@
+<dtml-var manage_page_header>
+<dtml-var manage_tabs>
+
+<h3>Introspection Tool</h3>
+<p>
+Introspection Tool provides both local and remote introspection.
+</p>
+
+<dtml-var manage_page_footer>