diff --git oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
index 5ca60b1..d132b5b 100644
--- oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
+++ oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
@@ -46,6 +46,7 @@ import javax.jcr.NoSuchWorkspaceException;
 import javax.management.JMException;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
+import javax.management.StandardMBean;
 import javax.security.auth.login.LoginException;
 
 import com.google.common.base.Function;
@@ -278,7 +279,14 @@ public class Oak {
                     } else {
                         objectName = new ObjectName(String.valueOf(name));
                     }
-                    mbeanServer.registerMBean(service, objectName);
+
+                    if (type.getName().equals(service.getClass().getName().concat("MBean"))){
+                        mbeanServer.registerMBean(service, objectName);
+                    } else {
+                        //Wrap the MBean in std MBean
+                        mbeanServer.registerMBean(new StandardMBean(service, type), objectName);
+                    }
+
                 } catch (JMException e) {
                     LOG.warn("Unexpected exception while registering MBean of type [{}] " +
                             "against name [{}]", type, objectName, e);
diff --git oak-core/src/test/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtilsTest.java oak-core/src/test/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtilsTest.java
index f9685d7..ffc76da 100644
--- oak-core/src/test/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtilsTest.java
+++ oak-core/src/test/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtilsTest.java
@@ -72,6 +72,16 @@ public class WhiteboardUtilsTest {
         assertTrue(WhiteboardUtils.quoteIfRequired("text*with?chars").startsWith("\""));
     }
 
+    @Test
+    public void stdMBean() throws Exception{
+        MBeanServer server = ManagementFactory.getPlatformMBeanServer();
+        Oak oak = new Oak().with(server);
+        Whiteboard wb = oak.getWhiteboard();
+        Hello hello = new HelloTest();
+        regs.add(WhiteboardUtils.registerMBean(wb, HelloMBean.class, hello, "test", "hello"));
+        assertNotNull(server.getObjectInstance(new ObjectName("org.apache.jackrabbit.oak:type=test,name=hello")));
+    }
+
     private interface HelloMBean {
         boolean isRunning();
         int getCount();
@@ -91,4 +101,8 @@ public class WhiteboardUtilsTest {
             return count;
         }
     }
+
+    private static class HelloTest extends Hello {
+
+    }
 }