diff --git a/tools/apidoc/pom.xml b/tools/apidoc/pom.xml
index 0511d2fe603..d36b8ebeb6b 100644
--- a/tools/apidoc/pom.xml
+++ b/tools/apidoc/pom.xml
@@ -9,59 +9,76 @@
   OF ANY KIND, either express or implied. See the License for the specific 
   language governing permissions and limitations under the License. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>cloud-apidoc</artifactId>
-  <name>Apache CloudStack apidoc Tools</name>
-  <packaging>pom</packaging>
-  <parent>
-    <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloudstack</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
-  </parent>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.cloudstack</groupId>
-      <artifactId>cloud-client-ui</artifactId>
-      <version>${project.version}</version>
-      <type>war</type>
-    </dependency>
-  </dependencies>
-  <properties>
-    <client.config.base>../../client/target/cloud-client-ui-4.1.0-SNAPSHOT/WEB-INF/</client.config.base>
-    <client.config.jars>${client.config.base}/lib</client.config.jars>
-    <client.config.conf>${client.config.base}/classes</client.config.conf>
-  </properties>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>cloud-apidoc</artifactId>
+    <name>Apache CloudStack apidoc Tools</name>
+    <packaging>pom</packaging>
+    <parent>
+        <groupId>org.apache.cloudstack</groupId>
+        <artifactId>cloudstack</artifactId>
+        <version>4.1.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.cloudstack</groupId>
+            <artifactId>cloud-client-ui</artifactId>
+            <version>${project.version}</version>
+            <type>war</type>
+        </dependency>
+    </dependencies>
+    <properties>
+        <client.config.base>../../client/target/cloud-client-ui-4.1.0-SNAPSHOT/WEB-INF/</client.config.base>
+        <client.config.jars>${client.config.base}/lib</client.config.jars>
+        <client.config.conf>${client.config.base}/classes</client.config.conf>
+    </properties>
 
-  <build>
-    <defaultGoal>install</defaultGoal>
-    <plugins>
-    <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <version>1.2.1</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <executable>bash</executable>
-          <arguments>
-            <argument>-x</argument>
-            <argument>./build-apidoc.sh</argument>
-            <argument>${client.config.jars}</argument>
-            <argument>${client.config.jars}</argument>
-            <argument>./target</argument>
-            <argument>-f</argument>
-            <argument>${client.config.conf}/commands.properties, ${client.config.conf}/commands-ext.properties,${client.config.conf}/virtualrouter_commands.properties, ${client.config.conf}/nicira-nvp_commands.properties </argument>
-          </arguments>
-        </configuration>
-      </plugin>
-      </plugins>
-  </build>
+    <build>
+        <defaultGoal>install</defaultGoal>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>bash</executable>
+                            <arguments>
+                                <argument>-x</argument>
+                                <argument>./build-apidoc.sh</argument>
+                                <argument>${client.config.jars}</argument>
+                                <argument>${client.config.jars}</argument>
+                                <argument>./target</argument>
+                                <argument>-f</argument>
+                                <argument>${client.config.conf}/commands.properties, ${client.config.conf}/commands-ext.properties,${client.config.conf}/virtualrouter_commands.properties, ${client.config.conf}/nicira-nvp_commands.properties </argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>package</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <workingDirectory>target</workingDirectory>
+                            <executable>tar</executable>
+                            <arguments>
+                                <argument>-cvjf</argument>
+                                <argument>apidoc.tar.bz2</argument>
+                                <argument>xmldoc</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>