diff --git a/agent/pom.xml b/agent/pom.xml
index 2192060e71a..a893eb513fd 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.0.0-incubating-SNAPSHOT</version>
+    <version>4.0.1-incubating-SNAPSHOT</version>
   </parent>
   <dependencies>
     <dependency>
diff --git a/api/pom.xml b/api/pom.xml
index cf307a6b782..b43f7a26884 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.0.0-incubating-SNAPSHOT</version>
+    <version>4.0.1-incubating-SNAPSHOT</version>
   </parent>
   <dependencies>
     <dependency>
diff --git a/awsapi/pom.xml b/awsapi/pom.xml
index d2f072129e6..3667699dc16 100644
--- a/awsapi/pom.xml
+++ b/awsapi/pom.xml
@@ -20,12 +20,12 @@
          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-awsapi</artifactId>
-  <version>4.0.0-incubating-SNAPSHOT</version>
+  <version>4.0.1-incubating-SNAPSHOT</version>
   <name>Apache CloudStack AWS API Bridge</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.0.0-incubating-SNAPSHOT</version>
+    <version>4.0.1-incubating-SNAPSHOT</version>
   </parent>
   <dependencies>
     <dependency>
diff --git a/client/pom.xml b/client/pom.xml
index c10b67778d6..add72e16e47 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.0.0-incubating-SNAPSHOT</version>
+    <version>4.0.1-incubating-SNAPSHOT</version>
   </parent>
   <dependencies>
     <dependency>
diff --git a/console-proxy/pom.xml b/console-proxy/pom.xml
index 53884d31265..9c1bf250f0a 100644
--- a/console-proxy/pom.xml
+++ b/console-proxy/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.0.0-incubating-SNAPSHOT</version>
+    <version>4.0.1-incubating-SNAPSHOT</version>
   </parent>
   <dependencies>
     <dependency>
diff --git a/core/pom.xml b/core/pom.xml
index f08ca49daef..af6a3b7f0f3 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.0.0-incubating-SNAPSHOT</version>
+    <version>4.0.1-incubating-SNAPSHOT</version>
   </parent>
   <dependencies>
     <dependency>
diff --git a/deps/XenServerJava/pom.xml b/deps/XenServerJava/pom.xml
index 614b13ca113..79c4e8440cf 100644
--- a/deps/XenServerJava/pom.xml
+++ b/deps/XenServerJava/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.0.0-incubating-SNAPSHOT</version>
+    <version>4.0.1-incubating-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>xapi</artifactId>
diff --git a/deps/pom.xml b/deps/pom.xml
index 069da5c83f6..90de4ac52ec 100644
--- a/deps/pom.xml
+++ b/deps/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.0.0-incubating-SNAPSHOT</version>
+    <version>4.0.1-incubating-SNAPSHOT</version>
   </parent>
   <dependencies>
     <dependency>
diff --git a/patches/pom.xml b/patches/pom.xml
index da78160e6d2..4f8b4b226cd 100644
--- a/patches/pom.xml
+++ b/patches/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.0.0-incubating-SNAPSHOT</version>
+    <version>4.0.1-incubating-SNAPSHOT</version>
   </parent>
   <dependencies>
     <dependency>
diff --git a/plugins/deployment-planners/user-concentrated-pod/pom.xml b/plugins/deployment-planners/user-concentrated-pod/pom.xml
index 1b98fec1847..5dfc81bd076 100644
--- a/plugins/deployment-planners/user-concentrated-pod/pom.xml
+++ b/plugins/deployment-planners/user-concentrated-pod/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.0.0-incubating-SNAPSHOT</version>
+    <version>4.0.1-incubating-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 </project>
diff --git a/plugins/deployment-planners/user-dispersing/pom.xml b/plugins/deployment-planners/user-dispersing/pom.xml
index d2fbd7ba9ec..17746f81d95 100644
--- a/plugins/deployment-planners/user-dispersing/pom.xml
+++ b/plugins/deployment-planners/user-dispersing/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.0.0-incubating-SNAPSHOT</version>
+    <version>4.0.1-incubating-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 </project>
diff --git a/plugins/host-allocators/random/pom.xml b/plugins/host-allocators/random/pom.xml
index 28b8ae053f6..fb3c1446655 100644
--- a/plugins/host-allocators/random/pom.xml
+++ b/plugins/host-allocators/random/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.0.0-incubating-SNAPSHOT</version>
+    <version>4.0.1-incubating-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 </project>
diff --git a/plugins/hypervisors/kvm/pom.xml b/plugins/hypervisors/kvm/pom.xml
index ba7c9ef5d03..0460f653765 100644
--- a/plugins/hypervisors/kvm/pom.xml
+++ b/plugins/hypervisors/kvm/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.0.0-incubating-SNAPSHOT</version>
+    <version>4.0.1-incubating-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <repositories>
diff --git a/plugins/hypervisors/ovm/pom.xml b/plugins/hypervisors/ovm/pom.xml
index 790c36f24bc..900780f7d7c 100644
--- a/plugins/hypervisors/ovm/pom.xml
+++ b/plugins/hypervisors/ovm/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.0.0-incubating-SNAPSHOT</version>
+    <version>4.0.1-incubating-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 </project>
diff --git a/plugins/hypervisors/xen/pom.xml b/plugins/hypervisors/xen/pom.xml
index d16fd324249..065c7079989 100644
--- a/plugins/hypervisors/xen/pom.xml
+++ b/plugins/hypervisors/xen/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.0.0-incubating-SNAPSHOT</version>
+    <version>4.0.1-incubating-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>
diff --git a/plugins/network-elements/elastic-loadbalancer/pom.xml b/plugins/network-elements/elastic-loadbalancer/pom.xml
index 9dab7a5a212..4a80620259d 100644
--- a/plugins/network-elements/elastic-loadbalancer/pom.xml
+++ b/plugins/network-elements/elastic-loadbalancer/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.0.0-incubating-SNAPSHOT</version>
+    <version>4.0.1-incubating-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 </project>
diff --git a/plugins/network-elements/nicira-nvp/pom.xml b/plugins/network-elements/nicira-nvp/pom.xml
index 92cc73e7a64..ba5f92a9e8a 100644
--- a/plugins/network-elements/nicira-nvp/pom.xml
+++ b/plugins/network-elements/nicira-nvp/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.0.0-incubating-SNAPSHOT</version>
+    <version>4.0.1-incubating-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 </project>
diff --git a/plugins/network-elements/ovs/pom.xml b/plugins/network-elements/ovs/pom.xml
index 926c4f928b3..348bcd6a5f3 100644
--- a/plugins/network-elements/ovs/pom.xml
+++ b/plugins/network-elements/ovs/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.0.0-incubating-SNAPSHOT</version>
+    <version>4.0.1-incubating-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 </project>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 8aeae9f9f02..00b8140b613 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.0.0-incubating-SNAPSHOT</version>
+    <version>4.0.1-incubating-SNAPSHOT</version>
   </parent>
   <build>
     <defaultGoal>install</defaultGoal>
diff --git a/plugins/storage-allocators/random/pom.xml b/plugins/storage-allocators/random/pom.xml
index 1eb412cdd92..7dbb22be87c 100644
--- a/plugins/storage-allocators/random/pom.xml
+++ b/plugins/storage-allocators/random/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.0.0-incubating-SNAPSHOT</version>
+    <version>4.0.1-incubating-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 </project>
diff --git a/plugins/user-authenticators/ldap/pom.xml b/plugins/user-authenticators/ldap/pom.xml
index 873824cbf31..6562b80e16a 100644
--- a/plugins/user-authenticators/ldap/pom.xml
+++ b/plugins/user-authenticators/ldap/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.0.0-incubating-SNAPSHOT</version>
+    <version>4.0.1-incubating-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 </project>
diff --git a/plugins/user-authenticators/md5/pom.xml b/plugins/user-authenticators/md5/pom.xml
index 39664ecb12a..e00b3bbebf5 100644
--- a/plugins/user-authenticators/md5/pom.xml
+++ b/plugins/user-authenticators/md5/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.0.0-incubating-SNAPSHOT</version>
+    <version>4.0.1-incubating-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 </project>
diff --git a/plugins/user-authenticators/plain-text/pom.xml b/plugins/user-authenticators/plain-text/pom.xml
index 597810dc47d..31ed53053ef 100644
--- a/plugins/user-authenticators/plain-text/pom.xml
+++ b/plugins/user-authenticators/plain-text/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.0.0-incubating-SNAPSHOT</version>
+    <version>4.0.1-incubating-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 </project>
diff --git a/pom.xml b/pom.xml
index 7dd89adcbce..8394ed6c583 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 
   <groupId>org.apache.cloudstack</groupId>
   <artifactId>cloudstack</artifactId>
-  <version>4.0.0-incubating-SNAPSHOT</version>
+  <version>4.0.1-incubating-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Apache CloudStack</name>
   <description>CloudStack is an IaaS (“Infrastracture as a Service”) cloud orchestration platform.</description>
diff --git a/server/pom.xml b/server/pom.xml
index 8d31485e2b6..cd54047199a 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.0.0-incubating-SNAPSHOT</version>
+    <version>4.0.1-incubating-SNAPSHOT</version>
   </parent>
   <dependencies>
     <dependency>
diff --git a/test/pom.xml b/test/pom.xml
index 67a60c88e87..6459ecf5e04 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.cloudstack</groupId>
         <artifactId>cloudstack</artifactId>
-        <version>4.0.0-incubating-SNAPSHOT</version>
+        <version>4.0.1-incubating-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/usage/pom.xml b/usage/pom.xml
index 1fb70a6b419..278b788e906 100644
--- a/usage/pom.xml
+++ b/usage/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.0.0-incubating-SNAPSHOT</version>
+    <version>4.0.1-incubating-SNAPSHOT</version>
   </parent>
   <dependencies>
     <dependency>
diff --git a/utils/pom.xml b/utils/pom.xml
index 0dff7992db7..83b8fbb956e 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.0.0-incubating-SNAPSHOT</version>
+    <version>4.0.1-incubating-SNAPSHOT</version>
   </parent>
   <dependencies>
     <dependency>
diff --git a/vmware-base/pom.xml b/vmware-base/pom.xml
index fe4444a346f..07fa511e06c 100644
--- a/vmware-base/pom.xml
+++ b/vmware-base/pom.xml
@@ -18,13 +18,13 @@
 -->
 <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>
+  <modelVersion>4.0.1</modelVersion>
   <artifactId>cloud-vmware-base</artifactId>
   <name>Apache CloudStack VMware Base</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.0.0-incubating-SNAPSHOT</version>
+    <version>4.0.1-incubating-SNAPSHOT</version>
   </parent>
   <dependencies>
     <dependency>
diff --git a/wscript b/wscript
index 46f9fa7c4d8..06586ee7ee4 100644
--- a/wscript
+++ b/wscript
@@ -23,8 +23,8 @@
 # in cloud.spec, add a %changelog entry there, and add an 
 # entry in debian/changelog. SHORTVERSION is used in package
 # naming for deb/rpm, VERSION is used for tarball and bin 
-VERSION = '4.0.0-incubating'
-SHORTVERSION = '4.0.0'
+VERSION = '4.0.1-incubating'
+SHORTVERSION = '4.0.1'
 APPNAME = 'cloud'
 
 import shutil,os