diff --git a/pom.xml b/pom.xml
index d620b681020..2c7f3f1f95e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,8 +159,9 @@
     <module>patches</module>
     <module>client</module>
     <module>test</module>
-    <module>tools/devcloud</module>
     <module>tools/apidoc</module>
+    <module>tools/devcloud</module>
+    <module>tools/marvin</module>
   </modules>
 
   <dependencies>
diff --git a/tools/marvin/pom.xml b/tools/marvin/pom.xml
new file mode 100644
index 00000000000..5b5bf576a4d
--- /dev/null
+++ b/tools/marvin/pom.xml
@@ -0,0 +1,69 @@
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+  license agreements. See the NOTICE file distributed with this work for additional 
+  information regarding copyright ownership. The ASF licenses this file to 
+  you under the Apache License, Version 2.0 (the "License"); you may not use 
+  this file except in compliance with the License. You may obtain a copy of 
+  the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+  by applicable law or agreed to in writing, software distributed under the 
+  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+  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-marvin</artifactId>
+  <name>Apache CloudStack Developer Tools: marvin</name>
+  <packaging>pom</packaging>
+  <parent>
+    <groupId>org.apache.cloudstack</groupId>
+    <artifactId>cloudstack</artifactId>
+    <version>4.1.0-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
+  </parent>
+
+  <build>
+    <defaultGoal>install</defaultGoal>
+    <plugins>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.7</version>
+        <executions>
+          <execution>
+            <id>generate-resource</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <delete dir="marvin/cloudstackAPI"/>  
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+     <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.2.1</version>
+        <executions>
+          <execution>
+            <phase>install</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <workingDirectory>marvin</workingDirectory>
+          <executable>python</executable>
+          <arguments>
+            <argument>codegenerator.py</argument>
+            <argument>-s</argument>
+            <argument>${basedir}/../apidoc/target/commands.xml</argument>
+          </arguments>
+        </configuration>
+     </plugin>
+    </plugins>
+  </build>
+</project>