diff --git a/config/alfresco/core-services-context.xml b/config/alfresco/core-services-context.xml
index d52b3116f1..826e02a593 100644
--- a/config/alfresco/core-services-context.xml
+++ b/config/alfresco/core-services-context.xml
@@ -82,7 +82,8 @@
          <map>
            <!-- MBeans to register with alfrescoMBeanServer -->
            <entry key="Alfresco:Name=VirtServerRegistry,Type=VirtServerRegistry" value-ref="VirtServerRegistry"/>
-           <entry key="Alfresco:Name=FileServerConfig,Type=FileServerConfig" value-ref="FileServerConfig"/>
+           <entry key="Alfresco:Name=FileServerConfig,Type=FileServerConfig" value-ref="FileServerConfig"/>
+           <entry key="Alfresco:Name=Log4jHierarchy,Type=Log4JHierarchy" value-ref="log4jHierarchy"/>
          </map>
        </property>
     </bean>
@@ -119,6 +120,13 @@
         <property name="fileServerConfiguration"><ref bean="fileServerConfiguration"/></property>
     </bean>
 
+    <!-- Log4J Hierarchy -->
+    <bean id="log4jHierarchy" class="org.apache.log4j.jmx.HierarchyDynamicMBean"/>
+    
+    <bean id="log4JHierarchyInit" class="org.alfresco.repo.admin.Log4JHierarchyInit" init-method="init">
+    	<property name="log4jHierarchy" ref="log4jHierarchy"/>
+    </bean>
+
     <!-- Datasource bean -->
     <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
         <property name="driverClassName">
diff --git a/source/java/org/alfresco/repo/admin/Log4JHierarchyInit.java b/source/java/org/alfresco/repo/admin/Log4JHierarchyInit.java
new file mode 100644
index 0000000000..42d54ccd0b
--- /dev/null
+++ b/source/java/org/alfresco/repo/admin/Log4JHierarchyInit.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2005-2007 Alfresco Software Limited.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of
+ * the GPL, you may redistribute this Program in connection with Free/Libre
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's
+ * FLOSS exception.  You should have recieved a copy of the text describing
+ * the FLOSS exception, and it is also available here:
+ * http://www.alfresco.com/legal/licensing"
+ */
+package org.alfresco.repo.admin;
+
+import java.util.Enumeration;
+
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+import org.apache.log4j.jmx.HierarchyDynamicMBean;
+import org.apache.log4j.spi.LoggerRepository;
+
+/**
+ * Initialises Log4j's HierarchyDynamicMBean (refer to core-services-context.xml)
+ *
+ */
+public class Log4JHierarchyInit
+{
+	private HierarchyDynamicMBean log4jHierarchy;
+	
+	public void setLog4jHierarchy(HierarchyDynamicMBean log4jHierarchy)
+	{
+		this.log4jHierarchy = log4jHierarchy;
+	}
+	
+	@SuppressWarnings("unchecked")
+	public void init()
+	{
+	    // Add each logger (that has a level set) from the Log4J Repository to the Hierarchy MBean	    
+	    LoggerRepository r = LogManager.getLoggerRepository();
+	
+	    Enumeration loggers = r.getCurrentLoggers();
+	    Logger logger = null;
+	   
+	    while (loggers.hasMoreElements())
+	    {
+	    	logger = (Logger)loggers.nextElement();
+	    	if (logger.getLevel() != null)
+	    	{
+	    		log4jHierarchy.addLoggerMBean(logger.getName());
+	    	}
+	    }
+	}
+}