diff --git a/distribution/activemq/pom.xml b/distribution/activemq/pom.xml
index 8d60c60655..c0e58459f3 100644
--- a/distribution/activemq/pom.xml
+++ b/distribution/activemq/pom.xml
@@ -179,6 +179,11 @@
           <groupId>org.apache.geronimo.specs</groupId>
           <artifactId>geronimo-servlet_3.0_spec</artifactId>
        </dependency>
+       <dependency>
+          <groupId>org.jolokia</groupId>
+          <artifactId>jolokia-war</artifactId>
+          <type>war</type>
+       </dependency>
        <!-- javadoc -->
        <dependency>
            <groupId>org.apache.activemq</groupId>
diff --git a/distribution/activemq/src/main/assembly/dep.xml b/distribution/activemq/src/main/assembly/dep.xml
index 1a60ed2550..a4c17ac0a5 100644
--- a/distribution/activemq/src/main/assembly/dep.xml
+++ b/distribution/activemq/src/main/assembly/dep.xml
@@ -84,6 +84,13 @@
            <outputDirectory>web/api</outputDirectory>
            <unpack>true</unpack>
        </dependencySet>
+       <dependencySet>
+           <includes>
+               <include>org.jolokia:jolokia-war:war</include>
+           </includes>
+           <outputDirectory>web</outputDirectory>
+           <unpack>false</unpack>
+       </dependencySet>
    </dependencySets>
    <fileSets>
      <!-- schema -->
diff --git a/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml b/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml
index 698da46b1b..76f88d1fda 100644
--- a/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml
+++ b/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml
@@ -26,7 +26,9 @@
 
    <naming bindAddress="localhost" port="1099" rmiBindAddress="localhost" rmiPort="1098"/>
 
-   <web bind="http://localhost:8161" path="web"/>
+   <web bind="http://localhost:8161" path="web">
+       <app url="jolokia" war="jolokia-war-1.2.3.war"/>
+   </web>
 
 </broker>
 
diff --git a/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml b/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml
index dbec7065ff..a88b77718e 100644
--- a/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml
+++ b/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml
@@ -26,7 +26,9 @@
 
    <naming bindAddress="localhost" port="1099" rmiBindAddress="localhost" rmiPort="1098"/>
 
-   <web bind="http://localhost:8161" path="web"/>
+   <web bind="http://localhost:8161" path="web">
+       <app url="jolokia" war="jolokia-war-1.2.3.war"/>
+   </web>
 
 </broker>
 
diff --git a/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml b/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml
index 1bf29ed63f..6fd5686ae1 100644
--- a/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml
+++ b/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml
@@ -26,7 +26,9 @@
 
    <naming bindAddress="localhost" port="1099" rmiBindAddress="localhost" rmiPort="1098"/>
 
-   <web bind="http://localhost:8161" path="web"/>
+   <web bind="http://localhost:8161" path="web">
+       <app url="jolokia" war="jolokia-war-1.2.3.war"/>
+   </web>
 
 </broker>
 
diff --git a/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml b/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml
index 0da0234fff..344157b8d6 100644
--- a/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml
+++ b/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml
@@ -26,7 +26,9 @@
 
    <naming bindAddress="localhost" port="1099" rmiBindAddress="localhost" rmiPort="1098"/>
 
-   <web bind="http://localhost:8161" path="web"/>
+   <web bind="http://localhost:8161" path="web">
+       <app url="jolokia" war="jolokia-war-1.2.3.war"/>
+   </web>
 
 </broker>
 
diff --git a/pom.xml b/pom.xml
index c9281c047d..580ce49bf0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -368,7 +368,13 @@
            <groupId>org.apache.geronimo.specs</groupId>
            <artifactId>geronimo-servlet_3.0_spec</artifactId>
            <version>1.0</version>
-      </dependency>
+        </dependency>
+        <dependency>
+           <groupId>org.jolokia</groupId>
+           <artifactId>jolokia-war</artifactId>
+           <type>war</type>
+           <version>1.2.3</version>
+        </dependency>
          <!-- needed to compile the tests -->
          <dependency>
             <groupId>junit</groupId>