diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index a49fcda54..fbddea72c 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -775,6 +775,7 @@ $config['os'][$os]['text'] = 'Apple AirPort';
 $config['os'][$os]['icon'] = 'apple';
 
 $os = 'windows';
+$config['os'][$os]['type']              = 'server';
 $config['os'][$os]['text']              = 'Microsoft Windows';
 $config['os'][$os]['ifname']            = 1;
 $config['os'][$os]['processor_stacked'] = 1;
diff --git a/includes/polling/os/windows.inc.php b/includes/polling/os/windows.inc.php
index 7e1829d3b..9a9330e61 100644
--- a/includes/polling/os/windows.inc.php
+++ b/includes/polling/os/windows.inc.php
@@ -68,6 +68,19 @@ if ($poll_device['sysObjectID'] == '.1.3.6.1.4.1.311.1.1.3.1.1') {
     if (strstr($poll_device['sysDescr'], 'Build 7601')) {
         $version = '7 SP1 (NT 6.1)';
     }
+
+    if (strstr($poll_device['sysDescr'], 'Build 9200')) {
+        $version = '8 (NT 6.2)';
+    }
+
+    if (strstr($poll_device['sysDescr'], 'Version 6.3 (Build 9200')) {
+        $version = '8.1 (NT 6.3)';
+    }
+
+    if (strstr($poll_device['sysDescr'], 'Build 9600')) {
+        $version = '8.1 SP1 (NT 6.2)';
+    }
+
 }
 else if ($poll_device['sysObjectID'] == '.1.3.6.1.4.1.311.1.1.3.1.2') {
     if (strstr($poll_device['sysDescr'], 'Build Number: 1057')) {
@@ -105,6 +118,11 @@ else if ($poll_device['sysObjectID'] == '.1.3.6.1.4.1.311.1.1.3.1.2') {
     if (strstr($poll_device['sysDescr'], 'Build 9200')) {
         $version = 'Server 2012 (NT 6.2)';
     }
+
+    if (strstr($poll_device['sysDescr'], 'Build 9600')) {
+        $version = 'Server 2012 R2 (NT 6.3)';
+    }
+
 }
 else if ($poll_device['sysObjectID'] == '.1.3.6.1.4.1.311.1.1.3.1.3') {
     if (strstr($poll_device['sysDescr'], 'Build Number: 1057')) {
@@ -142,6 +160,11 @@ else if ($poll_device['sysObjectID'] == '.1.3.6.1.4.1.311.1.1.3.1.3') {
     if (strstr($poll_device['sysDescr'], 'Build 9200')) {
         $version = 'Server 2012 Datacenter (NT 6.2)';
     }
+
+    if (strstr($poll_device['sysDescr'], 'Build 9600')) {
+        $version = 'Server 2012 R2 Datacenter (NT 6.3)';
+    }
+
 }//end if
 
 if (strstr($poll_device['sysDescr'], 'Uniprocessor')) {