diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c
index f7eeeb5c53..652019644f 100644
--- a/src/esx/esx_vi.c
+++ b/src/esx/esx_vi.c
@@ -4712,6 +4712,7 @@ esxVI_ProductVersionToDefaultVirtualHWVersion(esxVI_ProductLine productLine,
 {
     /* product version == 1000000 * major + 1000 * minor + micro */
     int major = productVersion / 1000000;
+    int minor = productVersion / 1000 - major * 1000;
 
     /*
      * virtualHW.version compatibility matrix:
@@ -4723,6 +4724,7 @@ esxVI_ProductVersionToDefaultVirtualHWVersion(esxVI_ProductLine productLine,
      *   ESX 5.0    + + +        5.0
      *   ESX 5.1    + + + +      5.1
      *   ESX 5.5    + + + + +    5.5
+     *   ESX 6.0    + + + + +    6.0
      *   GSX 2.0    + +          2.5
      */
     switch (productLine) {
@@ -4738,6 +4740,14 @@ esxVI_ProductVersionToDefaultVirtualHWVersion(esxVI_ProductLine productLine,
             return 7;
 
           case 5:
+            if (minor < 5)
+                return 9;
+
+            return 10;
+
+          case 6:
+            return 10;
+
           default:
             return 8;
         }
@@ -4751,6 +4761,14 @@ esxVI_ProductVersionToDefaultVirtualHWVersion(esxVI_ProductLine productLine,
             return 7;
 
           case 5:
+            if (minor < 5)
+                return 9;
+
+            return 10;
+
+          case 6:
+            return 10;
+
           default:
             return 8;
         }