diff --git a/activemq-core-client/pom.xml b/activemq-core-client/pom.xml
index d9f17e07c3..8448d17a99 100644
--- a/activemq-core-client/pom.xml
+++ b/activemq-core-client/pom.xml
@@ -78,12 +78,6 @@
                   <artifactId>maven-javadoc-plugin</artifactId>
                   <version>2.9</version>
                   <configuration>
-                     <doclet>org.jboss.apiviz.APIviz</doclet>
-                     <docletArtifact>
-                        <groupId>org.jboss.apiviz</groupId>
-                        <artifactId>apiviz</artifactId>
-                        <version>1.3.2.GA</version>
-                     </docletArtifact>
                      <useStandardDocletOptions>true</useStandardDocletOptions>
                      <minmemory>128m</minmemory>
                      <maxmemory>512m</maxmemory>
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientRequestor.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientRequestor.java
index d084319ffc..b158f84f07 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientRequestor.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientRequestor.java
@@ -27,10 +27,6 @@ import org.apache.activemq.core.client.impl.ClientMessageImpl;
  * The ClientRequestor constructor is given a ClientSession and a request address.
  * It creates a temporary queue for the responses and provides a request method that sends the request message and waits for its reply.
  *
- * @apiviz.uses org.apache.activemq.api.core.client.ClientSession
- * @apiviz.owns org.apache.activemq.api.core.client.ClientProducer
- * @apiviz.owns org.apache.activemq.api.core.client.ClientConsumer
- *
  * @author <a href="jmesnil@redhat.com">Jeff Mesnil</a>
  */
 public final class ClientRequestor
diff --git a/activemq-jms-client/pom.xml b/activemq-jms-client/pom.xml
index e22aa2bd1c..16af0f0239 100644
--- a/activemq-jms-client/pom.xml
+++ b/activemq-jms-client/pom.xml
@@ -76,12 +76,6 @@
                   <artifactId>maven-javadoc-plugin</artifactId>
                   <version>2.9</version>
                   <configuration>
-                     <doclet>org.jboss.apiviz.APIviz</doclet>
-                     <docletArtifact>
-                        <groupId>org.jboss.apiviz</groupId>
-                        <artifactId>apiviz</artifactId>
-                        <version>1.3.2.GA</version>
-                     </docletArtifact>
                      <useStandardDocletOptions>true</useStandardDocletOptions>
                      <minmemory>128m</minmemory>
                      <maxmemory>512m</maxmemory>
diff --git a/activemq-jms-server/pom.xml b/activemq-jms-server/pom.xml
index b1a6df0139..1331b9f376 100644
--- a/activemq-jms-server/pom.xml
+++ b/activemq-jms-server/pom.xml
@@ -87,12 +87,6 @@
                   <artifactId>maven-javadoc-plugin</artifactId>
                   <version>2.9</version>
                   <configuration>
-                     <doclet>org.jboss.apiviz.APIviz</doclet>
-                     <docletArtifact>
-                        <groupId>org.jboss.apiviz</groupId>
-                        <artifactId>apiviz</artifactId>
-                        <version>1.3.2.GA</version>
-                     </docletArtifact>
                      <useStandardDocletOptions>true</useStandardDocletOptions>
                      <minmemory>128m</minmemory>
                      <maxmemory>512m</maxmemory>
diff --git a/activemq-server/pom.xml b/activemq-server/pom.xml
index 54470e3403..78a56ef15d 100644
--- a/activemq-server/pom.xml
+++ b/activemq-server/pom.xml
@@ -93,12 +93,6 @@
                   <artifactId>maven-javadoc-plugin</artifactId>
                   <version>2.9</version>
                   <configuration>
-                     <doclet>org.jboss.apiviz.APIviz</doclet>
-                     <docletArtifact>
-                        <groupId>org.jboss.apiviz</groupId>
-                        <artifactId>apiviz</artifactId>
-                        <version>1.3.2.GA</version>
-                     </docletArtifact>
                      <useStandardDocletOptions>true</useStandardDocletOptions>
                      <minmemory>128m</minmemory>
                      <maxmemory>512m</maxmemory>
diff --git a/activemq-website/pom.xml b/activemq-website/pom.xml
index 3f95fe0fac..725ef6bcd7 100644
--- a/activemq-website/pom.xml
+++ b/activemq-website/pom.xml
@@ -83,12 +83,6 @@
                                  <goal>jar</goal>
                              </goals>
                              <configuration>
-                                 <doclet>org.jboss.apiviz.APIviz</doclet>
-                                 <docletArtifact>
-                                     <groupId>org.jboss.apiviz</groupId>
-                                     <artifactId>apiviz</artifactId>
-                                     <version>1.3.2.GA</version>
-                                 </docletArtifact>
                                  <useStandardDocletOptions>true</useStandardDocletOptions>
                                  <minmemory>128m</minmemory>
                                  <maxmemory>512m</maxmemory>
diff --git a/pom.xml b/pom.xml
index 018055fbb3..d1bb427f57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,16 +185,6 @@
 
    <dependencyManagement>
       <dependencies>
-         <!-- ## Documentation Build Dependencies ## -->
-         <dependency>
-            <groupId>org.jboss.apiviz</groupId>
-            <artifactId>apiviz</artifactId>
-            <version>1.3.2.GA</version>
-            <scope>release</scope>
-            <!-- License: LGPL -->
-         </dependency>
-         <!-- ## End Documentation Build Dependencies ## -->
-
          <!-- ## Test Dependenices ## Note: Junit is required in certain module tests.  We should control versions from here. -->
          <dependency>
             <groupId>junit</groupId>