diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 4a8713f9639..3a0ad6158d0 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -1260,11 +1260,11 @@ public class ManagementServerImpl implements ManagementServer {
             throw new InvalidParameterValueException("VM is not Running, unable to migrate the vm " + vm);
         }
 
-        if (!vm.getHypervisorType().equals(HypervisorType.XenServer)) {
+        if (!vm.getHypervisorType().equals(HypervisorType.XenServer) && !vm.getHypervisorType().equals(HypervisorType.VMware)) {
             if (s_logger.isDebugEnabled()) {
-                s_logger.debug(vm + " is not XenServer, cannot migrate this VM.");
+                s_logger.debug(vm + " is not XenServer/VMware, cannot migrate this VM.");
             }
-            throw new InvalidParameterValueException("Unsupported Hypervisor Type for VM migration, we support XenServer only");
+            throw new InvalidParameterValueException("Unsupported Hypervisor Type for VM migration, we support XenServer/VMware only");
         }
         ServiceOfferingVO svcOffering = _offeringsDao.findById(vm.getServiceOfferingId());
         if (svcOffering.getUseLocalStorage()) {
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 1741e25b597..53e5fd8d80c 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -3263,9 +3263,9 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
             }
             throw new InvalidParameterValueException("VM is not Running, unable to migrate the vm " + vm);
         }
-        if (!vm.getHypervisorType().equals(HypervisorType.XenServer)) {
+        if (!vm.getHypervisorType().equals(HypervisorType.XenServer) && !vm.getHypervisorType().equals(HypervisorType.VMware)) {
             if (s_logger.isDebugEnabled()) {
-                s_logger.debug(vm + " is not XenServer, cannot migrate this VM.");
+                s_logger.debug(vm + " is not XenServer/VMware, cannot migrate this VM.");
             }
             throw new InvalidParameterValueException("Unsupported Hypervisor Type for VM migration, we support XenServer only");
         }