diff --git a/plugins/dbms/mssqlserver/fingerprint.py b/plugins/dbms/mssqlserver/fingerprint.py
index f869c089e..90fffb160 100644
--- a/plugins/dbms/mssqlserver/fingerprint.py
+++ b/plugins/dbms/mssqlserver/fingerprint.py
@@ -134,14 +134,16 @@ class Fingerprint(GenericFingerprint):
         self.createSupportTbl(self.fileTblName, self.tblField, "varchar(1000)")
         inject.goStacked("INSERT INTO %s(%s) VALUES (%s)" % (self.fileTblName, self.tblField, "@@VERSION"))
 
-        versions = { "2003": ("5.2", (2, 1)),
-                     # TODO: verify this
-                     #"2003": ("6.0", (2, 1)),
-                     "2008": ("7.0", (2, 1,)),
+        # Reference: http://en.wikipedia.org/wiki/Comparison_of_Microsoft_Windows_versions
+        # http://en.wikipedia.org/wiki/Windows_NT#Releases
+        versions = { "NT": ("4.0", (6, 5, 4, 3, 2, 1)),
                      "2000": ("5.0", (4, 3, 2, 1)),
-                     "7": ("6.1", (1, 0)),
                      "XP": ("5.1", (3, 2, 1)),
-                     "NT": ("4.0", (6, 5, 4, 3, 2, 1)) }
+                     "2003": ("5.2", (2, 1)),
+                     "Vista or 2008": ("6.0", (2, 1)),
+                     "7 or 2008 R2": ("6.1", (1, 0)),
+                     "8 or 2012": ("6.2", (0,)),
+                     "8.1 or 2012 R2": ("6.3", (0,)) }
 
         # Get back-end DBMS underlying operating system version
         for version, data in versions.items():