diff --git a/agent/core/src/main/java/org/jolokia/detector/ActiveMQDetector.java b/agent/core/src/main/java/org/jolokia/detector/ActiveMQDetector.java
new file mode 100644
index 000000000..9116f9641
--- /dev/null
+++ b/agent/core/src/main/java/org/jolokia/detector/ActiveMQDetector.java
@@ -0,0 +1,20 @@
+package org.jolokia.detector;
+
+import org.jolokia.backend.executor.MBeanServerExecutor;
+
+/**
+ * Detector for ActiveMQ
+ *
+ * @author roland
+ * @since 27.03.14
+ */
+public class ActiveMQDetector extends AbstractServerDetector {
+
+    public ServerHandle detect(MBeanServerExecutor pMBeanServerExecutor) {
+        String version = getSingleStringAttribute(pMBeanServerExecutor, "org.apache.activemq:type=Broker,*", "BrokerVersion");
+        if (version == null) {
+            return null;
+        }
+        return new ServerHandle("Apache","activemq",version, null);
+    }
+}
diff --git a/agent/core/src/main/java/org/jolokia/detector/ServerDetector.java b/agent/core/src/main/java/org/jolokia/detector/ServerDetector.java
index 40c94bcd9..b188a52a1 100644
--- a/agent/core/src/main/java/org/jolokia/detector/ServerDetector.java
+++ b/agent/core/src/main/java/org/jolokia/detector/ServerDetector.java
@@ -36,9 +36,6 @@ public interface ServerDetector {
      * Detect the server. A {@link ServerHandle} descriptor is returned
      * in case of a successful detection, <code>null</code> otherwise.
      *
-     *
-     *
-     *
      * @param pMBeanServerExecutor a set of MBeanServers which can be used for detecting server informations
      * @return the server descriptor or <code>null</code> it this implementation cant detect 'its' server.
      */
diff --git a/agent/core/src/main/resources/META-INF/detectors-default b/agent/core/src/main/resources/META-INF/detectors-default
index 90d26a0c0..f42ef222d 100644
--- a/agent/core/src/main/resources/META-INF/detectors-default
+++ b/agent/core/src/main/resources/META-INF/detectors-default
@@ -1,5 +1,6 @@
 org.jolokia.detector.GeronimoDetector
 org.jolokia.detector.JBossDetector
+org.jolokia.detector.ActiveMQDetector
 org.jolokia.detector.TomcatDetector
 org.jolokia.detector.JettyDetector
 org.jolokia.detector.GlassfishDetector