diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index d24009ddbe8..08a03b1a181 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -1963,6 +1963,7 @@ public class VpcManagerImpl implements VpcManager, Manager{
         List<HypervisorType> hTypes = new ArrayList<HypervisorType>();
         hTypes.add(HypervisorType.XenServer);
         hTypes.add(HypervisorType.VMware);
+        hTypes.add(HypervisorType.KVM);
         return hTypes;
     }
 }
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 183617667cc..cc48b2f9c12 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -2240,7 +2240,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
                     throw new InvalidParameterValueException("Unable to find network by id " + networkIdList.get(0).longValue());
                 }
                 if (network.getVpcId() != null) {
-                    //Only XenServer and VmWare hypervisors are supported for vpc networks
+                    //Only XenServer, KVM, and VmWare hypervisors are supported for vpc networks
                     if (!vpcSupportedHTypes.contains(template.getHypervisorType())) {
                         throw new InvalidParameterValueException("Can't create vm from template with hypervisor "
                                 + template.getHypervisorType() + " in vpc network " + network);