diff --git a/tools/apidoc/pom.xml b/tools/apidoc/pom.xml
index 2ef0822a142..fe729ba95e5 100644
--- a/tools/apidoc/pom.xml
+++ b/tools/apidoc/pom.xml
@@ -9,67 +9,85 @@
   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 apidocs</name>
-    <packaging>pom</packaging>
-    <parent>
-        <groupId>org.apache.cloudstack</groupId>
-        <artifactId>cloud-tools</artifactId>
-        <version>4.3.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <properties>
-        <client.config.base>../../client/target/cloud-client-ui-4.3.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 apidocs</name>
+  <packaging>pom</packaging>
+  <parent>
+    <groupId>org.apache.cloudstack</groupId>
+    <artifactId>cloud-tools</artifactId>
+    <version>4.3.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  <properties>
+    <client.config.base>../../client/target/cloud-client-ui-4.3.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>
-                        <id>compile</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>bash</executable>
-                            <arguments>
-                                <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</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>-cjf</argument>
-                                <argument>apidoc.tar.bz2</argument>
-                                <argument>xmldoc</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </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>./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</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>-cjf</argument>
+                <argument>apidoc.tar.bz2</argument>
+                <argument>xmldoc</argument>
+              </arguments>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>${cs.maven.ant.version}</version>
+        <executions>
+          <execution>
+            <phase>install</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <copy file="${basedir}/target/commands.xml" todir="${project.basedir}/../marvin">
+                </copy>
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>