diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
index 4fd202beedc..b13730c34b7 100755
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
@@ -432,6 +432,9 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
 
     	if (prodBrand.equals("XenServer") && prodVersion.equals("6.0.2"))
     		return new XenServer602Resource();
+    	
+        if (prodBrand.equals("XenServer") && prodVersion.startsWith("6.0.9"))
+           return new XenServer602Resource();
 
     	if(prodBrand.equals("XenServer") && prodVersion.equals("5.6.100"))  {
     		String prodVersionTextShort = record.softwareVersion.get("product_version_text_short").trim();
@@ -446,7 +449,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
     		return new XcpOssResource();
     	}
     	
-    	String msg = "Only support XCP 1.0.0, 1.1.0, 1.5 beta; XenServer 5.6,  XenServer 5.6 FP1, XenServer 5.6 SP2, Xenserver 6.0, 6.0.2 but this one is " + prodBrand + " " + prodVersion;
+    	String msg = "Only support XCP 1.0.0, 1.1.0, 1.5 beta; XenServer 5.6,  XenServer 5.6 FP1, XenServer 5.6 SP2, Xenserver 6.0, 6.0.2, 6.0.9 but this one is " + prodBrand + " " + prodVersion;
     			_alertMgr.sendAlert(AlertManager.ALERT_TYPE_HOST, dcId, podId, msg, msg);
     	s_logger.debug(msg);
     	throw new RuntimeException(msg);
@@ -582,6 +585,8 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
             resource = XenServer600Resource.class.getName();
         } else if (prodBrand.equals("XenServer") && prodVersion.equals("6.0.2")) {
             resource = XenServer602Resource.class.getName();
+        } else if (prodBrand.equals("XenServer") && prodVersion.startsWith("6.0.9")) {
+            resource = XenServer602Resource.class.getName();	
         } else if(prodBrand.equals("XenServer") && prodVersion.equals("5.6.100"))  {
             String prodVersionTextShort = details.get("product_version_text_short").trim();
             if("5.6 SP2".equals(prodVersionTextShort)) {
@@ -594,7 +599,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
         }
         
         if( resource == null ){
-            String msg = "Only support XCP 1.0.0, 1.1.0, 1.5 beta; XenServer 5.6, 5.6 FP1, 5.6 SP2 and Xenserver 6.0 , 6.0.2 but this one is " + prodBrand + " " + prodVersion;
+            String msg = "Only support XCP 1.0.0, 1.1.0, 1.5 beta; XenServer 5.6, 5.6 FP1, 5.6 SP2 and Xenserver 6.0 , 6.0.2, 6.0.9 but this one is " + prodBrand + " " + prodVersion;
             s_logger.debug(msg);
             throw new RuntimeException(msg);
         }