diff --git a/CHANGELOG b/CHANGELOG
index 6a1952e0b..d04a811ee 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o Added http fingerprints for Sitecore CMS. [Jesper Kückelhahn]
+
 o Increased portability of configure scripts on systems using a libc
   other than Glibc. Several problems were reported by John Spencer.
 
diff --git a/nselib/data/http-fingerprints.lua b/nselib/data/http-fingerprints.lua
index 4df0b08dc..aafd397cf 100644
--- a/nselib/data/http-fingerprints.lua
+++ b/nselib/data/http-fingerprints.lua
@@ -2559,6 +2559,14 @@ table.insert(fingerprints, {
       {
         path = '/admin_cp.asp',
         method = 'HEAD'
+      },
+      {
+      	path = '/sitecore/admin/',
+      	method = 'HEAD'
+      },
+      {
+      	path = '/sitecore/login/admin/',
+      	method = 'HEAD'
       }
     },
     matches = {
@@ -11410,3 +11418,30 @@ table.insert(fingerprints, {
     }
   });
 
+table.insert(fingerprints, {
+    category = 'general',
+    probes = {
+      {
+        path = '/sitecore/shell/sitecore.version.xml',
+        method = 'GET'
+      },
+      {
+      	path = '/sitecore/login/default.aspx',
+      	method = 'GET'
+      }
+    },
+    matches = {
+      {
+        match = '<major>([^<]*)</major>.*<minor>([^<]*)</minor>.*<build>([^<]*)</build>.*<revision>([^<]*)</revision>',
+        output = '\\1.\\2.\\3 (rev. \\4)'
+      },
+      {
+      	match = 'class="SystemInformationDivider">.*Sitecore.NET ([^<]*)</div>',
+      	output = '\\1'
+      },
+      {
+      	match = '<hr/>.*Sitecore version ([^<]*)</div>',
+      	output = '\\1'
+      }
+    }
+  });