diff --git a/build/build-cloud.properties b/build/build-cloud.properties
index 552de7f74db..be67a368fc0 100755
--- a/build/build-cloud.properties
+++ b/build/build-cloud.properties
@@ -23,3 +23,4 @@ build.type=developer
 target.compat.version=1.6
 source.compat.version=1.6
 branding.name=default
+ssvm.include.vmware.jar=true
diff --git a/build/package.xml b/build/package.xml
index 83b58376cbf..f3435f8d3ae 100755
--- a/build/package.xml
+++ b/build/package.xml
@@ -123,7 +123,7 @@
     </zip>
   </target>
 
-  <target name="package-oss-systemvm-iso" depends="-init-package, package-oss-systemvm,  build-systemvm-patch">
+  <target name="package-oss-systemvm-iso" depends="-init-package, package-oss-systemvm, update-oss-systemvm-with-vmware, build-systemvm-patch">
     <exec executable="${mkisofs}" dir="${dist.dir}">
       <arg value="-quiet"/>
       <arg value="-r"/>
@@ -225,8 +225,6 @@
         <include name="${utils.jar}" />
         <include name="${core.jar}" />
         <include name="${api.jar}" />
-        <include name="${vmware-base.jar}" />
-          <include name="${vmware.jar}" />
       </zipfileset>
       <zipfileset dir="${console-proxy.dist.dir}" filemode="555"/>
       <zipfileset dir="${scripts.dir}/storage/secondary" prefix="scripts/storage/secondary" filemode="555">
@@ -236,6 +234,15 @@
     </zip>
   </target>
 
+  <target name="update-oss-systemvm-with-vmware" depends="-init-package" if="ssvm.include.vmware.jar">
+    <zip destfile="${dist.dir}/systemvm.zip" duplicate="preserve" update="true">
+      <zipfileset dir="${jar.dir}" >
+        <include name="${vmware.jar}" />
+        <include name="${vmware-base.jar}" />
+      </zipfileset>
+    </zip>
+  </target>	
+
   <target name="package-docs" depends="-init-package">
     <delete file="${dist.dir}/docs.zip" />
     <zip destfile="${dist.dir}/docs.zip" compress="false">