diff --git a/scripts/imap-ntlm-info.nse b/scripts/imap-ntlm-info.nse
index 674f5f0b9..264da0048 100644
--- a/scripts/imap-ntlm-info.nse
+++ b/scripts/imap-ntlm-info.nse
@@ -31,7 +31,7 @@ information to include NetBIOS, DNS, and OS build version.
 -- |   DNS_Domain_Name: somedomain.com
 -- |   DNS_Computer_Name: imap-test2.somedomain.com
 -- |   DNS_Tree_Name: somedomain.com
--- |_  Product_Version: 6.1 (Build 7601)
+-- |_  Product_Version: 6.1.7601
 --
 --@xmloutput
 -- <elem key="Target_Name">ACTIVEIMAP</elem>
@@ -40,7 +40,7 @@ information to include NetBIOS, DNS, and OS build version.
 -- <elem key="DNS_Domain_Name">somedomain.com</elem>
 -- <elem key="DNS_Computer_Name">imap-test2.somedomain.com</elem>
 -- <elem key="DNS_Tree_Name">somedomain.com</elem>
--- <elem key="Product_Version">6.1 (Build 7601)</elem>
+-- <elem key="Product_Version">6.1.7601</elem>
 
 
 author = "Justin Cacak"
diff --git a/scripts/nntp-ntlm-info.nse b/scripts/nntp-ntlm-info.nse
index 23bbfaacd..131c60ca7 100644
--- a/scripts/nntp-ntlm-info.nse
+++ b/scripts/nntp-ntlm-info.nse
@@ -29,7 +29,7 @@ information to include NetBIOS, DNS, and OS build version.
 -- |   DNS_Domain_Name: somedomain.com
 -- |   DNS_Computer_Name: nntp-test2.somedomain.com
 -- |   DNS_Tree_Name: somedomain.com
--- |_  Product_Version: 6.1 (Build 7601)
+-- |_  Product_Version: 6.1.7601
 --
 --@xmloutput
 -- <elem key="Target_Name">ACTIVENNTP</elem>
@@ -38,7 +38,7 @@ information to include NetBIOS, DNS, and OS build version.
 -- <elem key="DNS_Domain_Name">somedomain.com</elem>
 -- <elem key="DNS_Computer_Name">nntp-test2.somedomain.com</elem>
 -- <elem key="DNS_Tree_Name">somedomain.com</elem>
--- <elem key="Product_Version">6.1 (Build 7601)</elem>
+-- <elem key="Product_Version">6.1.7601</elem>
 
 
 author = "Justin Cacak"
diff --git a/scripts/pop3-ntlm-info.nse b/scripts/pop3-ntlm-info.nse
index c605dbf80..9e2808b92 100644
--- a/scripts/pop3-ntlm-info.nse
+++ b/scripts/pop3-ntlm-info.nse
@@ -30,7 +30,7 @@ information to include NetBIOS, DNS, and OS build version.
 -- |   DNS_Domain_Name: somedomain.com
 -- |   DNS_Computer_Name: pop3-test2.somedomain.com
 -- |   DNS_Tree_Name: somedomain.com
--- |_  Product_Version: 6.1 (Build 7601)
+-- |_  Product_Version: 6.1.7601
 --
 --@xmloutput
 -- <elem key="Target_Name">ACTIVEPOP3</elem>
@@ -39,7 +39,7 @@ information to include NetBIOS, DNS, and OS build version.
 -- <elem key="DNS_Domain_Name">somedomain.com</elem>
 -- <elem key="DNS_Computer_Name">pop3-test2.somedomain.com</elem>
 -- <elem key="DNS_Tree_Name">somedomain.com</elem>
--- <elem key="Product_Version">6.1 (Build 7601)</elem>
+-- <elem key="Product_Version">6.1.7601</elem>
 
 
 author = "Justin Cacak"
diff --git a/scripts/smtp-ntlm-info.nse b/scripts/smtp-ntlm-info.nse
index 20e52b751..83d94d548 100644
--- a/scripts/smtp-ntlm-info.nse
+++ b/scripts/smtp-ntlm-info.nse
@@ -30,7 +30,7 @@ information to include NetBIOS, DNS, and OS build version.
 -- |   DNS_Domain_Name: somedomain.com
 -- |   DNS_Computer_Name: smtp-test2.somedomain.com
 -- |   DNS_Tree_Name: somedomain.com
--- |_  Product_Version: 6.1 (Build 7601)
+-- |_  Product_Version: 6.1.7601
 --
 --@xmloutput
 -- <elem key="Target_Name">ACTIVESMTP</elem>
@@ -39,7 +39,7 @@ information to include NetBIOS, DNS, and OS build version.
 -- <elem key="DNS_Domain_Name">somedomain.com</elem>
 -- <elem key="DNS_Computer_Name">smtp-test2.somedomain.com</elem>
 -- <elem key="DNS_Tree_Name">somedomain.com</elem>
--- <elem key="Product_Version">6.1 (Build 7601)</elem>
+-- <elem key="Product_Version">6.1.7601</elem>
 
 
 author = "Justin Cacak"
diff --git a/scripts/telnet-ntlm-info.nse b/scripts/telnet-ntlm-info.nse
index 3a2cfbec4..04ec56fb7 100644
--- a/scripts/telnet-ntlm-info.nse
+++ b/scripts/telnet-ntlm-info.nse
@@ -29,7 +29,7 @@ NetBIOS, DNS, and OS build version.
 -- |   DNS_Domain_Name: somedomain.com
 -- |   DNS_Computer_Name: host-test2.somedomain.com
 -- |   DNS_Tree_Name: somedomain.com
--- |_  Product_Version: 5.1 (Build 2600)
+-- |_  Product_Version: 5.1.2600
 --
 --@xmloutput
 -- <elem key="Target_Name">ACTIVETELNET</elem>
@@ -38,7 +38,7 @@ NetBIOS, DNS, and OS build version.
 -- <elem key="DNS_Domain_Name">somedomain.com</elem>
 -- <elem key="DNS_Computer_Name">host-test2.somedomain.com</elem>
 -- <elem key="DNS_Tree_Name">somedomain.com</elem>
--- <elem key="Product_Version">5.1 (Build 2600)</elem>
+-- <elem key="Product_Version">5.1.2600</elem>
 
 
 author = "Justin Cacak"