diff --git a/CHANGELOG b/CHANGELOG
index 4b94f5543..95f86d167 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o Added a script that checks for ms08-067-vulnerable hosts 
+  (smb-check-vulns.nse) using the smb nselib. [Ron Bowes]
+
 o Added a Russian translation of the Nmap Reference Guide by Guz
   Alexander. We now have translations in 15 languages available from
   http://nmap.org/docs.html. More volunteer translaters are welcome,
diff --git a/scripts/script.db b/scripts/script.db
index 2d4d14ea0..6f7b184e1 100644
--- a/scripts/script.db
+++ b/scripts/script.db
@@ -1,104 +1,108 @@
-Entry{ category = "default", filename = "robots.txt.nse" }
-Entry{ category = "safe", filename = "robots.txt.nse" }
-Entry{ category = "intrusive", filename = "pop3-brute.nse" }
-Entry{ category = "auth", filename = "pop3-brute.nse" }
+Entry{ category = "default", filename = "upnp-info.nse" }
+Entry{ category = "safe", filename = "upnp-info.nse" }
 Entry{ category = "default", filename = "ftp-anon.nse" }
 Entry{ category = "auth", filename = "ftp-anon.nse" }
-Entry{ category = "intrusive", filename = "ftp-anon.nse" }
-Entry{ category = "discovery", filename = "daytime.nse" }
-Entry{ category = "default", filename = "smtp-commands.nse" }
-Entry{ category = "discovery", filename = "smtp-commands.nse" }
-Entry{ category = "safe", filename = "smtp-commands.nse" }
-Entry{ category = "default", filename = "dns-recursion.nse" }
-Entry{ category = "intrusive", filename = "dns-recursion.nse" }
-Entry{ category = "discovery", filename = "asn-query.nse" }
-Entry{ category = "external", filename = "asn-query.nse" }
+Entry{ category = "safe", filename = "ftp-anon.nse" }
 Entry{ category = "discovery", filename = "smb-enum-users.nse" }
 Entry{ category = "intrusive", filename = "smb-enum-users.nse" }
-Entry{ category = "external", filename = "dns-random-txid.nse" }
-Entry{ category = "intrusive", filename = "dns-random-txid.nse" }
-Entry{ category = "discovery", filename = "smb-enum-sessions.nse" }
-Entry{ category = "intrusive", filename = "smb-enum-sessions.nse" }
-Entry{ category = "default", filename = "pop3-capabilities.nse" }
-Entry{ category = "malware", filename = "smtp-strangeport.nse" }
-Entry{ category = "default", filename = "sshv1.nse" }
-Entry{ category = "safe", filename = "sshv1.nse" }
+Entry{ category = "external", filename = "dns-random-srcport.nse" }
+Entry{ category = "intrusive", filename = "dns-random-srcport.nse" }
+Entry{ category = "auth", filename = "xampp-default-auth.nse" }
+Entry{ category = "vuln", filename = "xampp-default-auth.nse" }
 Entry{ category = "version", filename = "pptp-version.nse" }
-Entry{ category = "default", filename = "irc-info.nse" }
-Entry{ category = "discovery", filename = "irc-info.nse" }
-Entry{ category = "discovery", filename = "smb-system-info.nse" }
-Entry{ category = "intrusive", filename = "smb-system-info.nse" }
-Entry{ category = "malware", filename = "irc-zombie.nse" }
+Entry{ category = "discovery", filename = "sniffer-detect.nse" }
+Entry{ category = "default", filename = "http-open-proxy.nse" }
+Entry{ category = "discovery", filename = "http-open-proxy.nse" }
+Entry{ category = "external", filename = "http-open-proxy.nse" }
+Entry{ category = "intrusive", filename = "http-open-proxy.nse" }
+Entry{ category = "malware", filename = "smtp-strangeport.nse" }
+Entry{ category = "demo", filename = "smtp-open-relay.nse" }
+Entry{ category = "discovery", filename = "smb-check-vulns.nse" }
+Entry{ category = "intrusive", filename = "smb-check-vulns.nse" }
 Entry{ category = "default", filename = "ms-sql-info.nse" }
 Entry{ category = "discovery", filename = "ms-sql-info.nse" }
 Entry{ category = "intrusive", filename = "ms-sql-info.nse" }
+Entry{ category = "discovery", filename = "smb-enum-shares.nse" }
+Entry{ category = "intrusive", filename = "smb-enum-shares.nse" }
+Entry{ category = "default", filename = "smtp-commands.nse" }
+Entry{ category = "discovery", filename = "smtp-commands.nse" }
+Entry{ category = "safe", filename = "smtp-commands.nse" }
+Entry{ category = "version", filename = "iax2-version.nse" }
+Entry{ category = "intrusive", filename = "sql-injection.nse" }
+Entry{ category = "vuln", filename = "sql-injection.nse" }
+Entry{ category = "discovery", filename = "smb-enum-sessions.nse" }
+Entry{ category = "intrusive", filename = "smb-enum-sessions.nse" }
+Entry{ category = "discovery", filename = "daytime.nse" }
+Entry{ category = "default", filename = "robots.txt.nse" }
+Entry{ category = "discovery", filename = "robots.txt.nse" }
+Entry{ category = "safe", filename = "robots.txt.nse" }
+Entry{ category = "discovery", filename = "asn-query.nse" }
+Entry{ category = "external", filename = "asn-query.nse" }
+Entry{ category = "discovery", filename = "smb-system-info.nse" }
+Entry{ category = "intrusive", filename = "smb-system-info.nse" }
+Entry{ category = "intrusive", filename = "snmp-brute.nse" }
+Entry{ category = "auth", filename = "snmp-brute.nse" }
+Entry{ category = "discovery", filename = "smb-server-stats.nse" }
+Entry{ category = "intrusive", filename = "smb-server-stats.nse" }
+Entry{ category = "default", filename = "http-auth.nse" }
+Entry{ category = "auth", filename = "http-auth.nse" }
+Entry{ category = "intrusive", filename = "http-auth.nse" }
+Entry{ category = "default", filename = "sshv1.nse" }
+Entry{ category = "safe", filename = "sshv1.nse" }
+Entry{ category = "default", filename = "smb-os-discovery.nse" }
+Entry{ category = "discovery", filename = "smb-os-discovery.nse" }
+Entry{ category = "safe", filename = "smb-os-discovery.nse" }
+Entry{ category = "default", filename = "auth-owners.nse" }
+Entry{ category = "safe", filename = "auth-owners.nse" }
+Entry{ category = "version", filename = "skypev2-version.nse" }
+Entry{ category = "default", filename = "dns-recursion.nse" }
+Entry{ category = "intrusive", filename = "dns-recursion.nse" }
+Entry{ category = "default", filename = "html-title.nse" }
+Entry{ category = "discovery", filename = "html-title.nse" }
+Entry{ category = "safe", filename = "html-title.nse" }
+Entry{ category = "discovery", filename = "whois.nse" }
+Entry{ category = "external", filename = "whois.nse" }
+Entry{ category = "safe", filename = "whois.nse" }
+Entry{ category = "safe", filename = "ssh-hostkey.nse" }
+Entry{ category = "default", filename = "ssh-hostkey.nse" }
+Entry{ category = "intrusive", filename = "ssh-hostkey.nse" }
+Entry{ category = "external", filename = "dns-random-txid.nse" }
+Entry{ category = "intrusive", filename = "dns-random-txid.nse" }
+Entry{ category = "default", filename = "realvnc-auth-bypass.nse" }
+Entry{ category = "vuln", filename = "realvnc-auth-bypass.nse" }
+Entry{ category = "default", filename = "snmp-sysdescr.nse" }
+Entry{ category = "discovery", filename = "snmp-sysdescr.nse" }
+Entry{ category = "safe", filename = "snmp-sysdescr.nse" }
+Entry{ category = "default", filename = "mysql-info.nse" }
+Entry{ category = "discovery", filename = "mysql-info.nse" }
+Entry{ category = "safe", filename = "mysql-info.nse" }
+Entry{ category = "default", filename = "pop3-capabilities.nse" }
+Entry{ category = "discovery", filename = "http-trace.nse" }
+Entry{ category = "default", filename = "ftp-bounce.nse" }
+Entry{ category = "intrusive", filename = "ftp-bounce.nse" }
+Entry{ category = "discovery", filename = "smb-enum-domains.nse" }
+Entry{ category = "intrusive", filename = "smb-enum-domains.nse" }
+Entry{ category = "discovery", filename = "smb-security-mode.nse" }
+Entry{ category = "safe", filename = "smb-security-mode.nse" }
+Entry{ category = "intrusive", filename = "http-passwd.nse" }
+Entry{ category = "vuln", filename = "http-passwd.nse" }
+Entry{ category = "auth", filename = "telnet-brute.nse" }
+Entry{ category = "intrusive", filename = "telnet-brute.nse" }
 Entry{ category = "default", filename = "zone-transfer.nse" }
 Entry{ category = "intrusive", filename = "zone-transfer.nse" }
 Entry{ category = "discovery", filename = "zone-transfer.nse" }
+Entry{ category = "default", filename = "rpcinfo.nse" }
+Entry{ category = "safe", filename = "rpcinfo.nse" }
+Entry{ category = "discovery", filename = "rpcinfo.nse" }
+Entry{ category = "default", filename = "finger.nse" }
+Entry{ category = "discovery", filename = "finger.nse" }
+Entry{ category = "default", filename = "irc-info.nse" }
+Entry{ category = "discovery", filename = "irc-info.nse" }
 Entry{ category = "default", filename = "sslv2.nse" }
 Entry{ category = "safe", filename = "sslv2.nse" }
 Entry{ category = "default", filename = "nbstat.nse" }
 Entry{ category = "discovery", filename = "nbstat.nse" }
 Entry{ category = "safe", filename = "nbstat.nse" }
-Entry{ category = "default", filename = "upnp-info.nse" }
-Entry{ category = "safe", filename = "upnp-info.nse" }
-Entry{ category = "default", filename = "rpcinfo.nse" }
-Entry{ category = "safe", filename = "rpcinfo.nse" }
-Entry{ category = "discovery", filename = "rpcinfo.nse" }
-Entry{ category = "safe", filename = "ssh-hostkey.nse" }
-Entry{ category = "default", filename = "ssh-hostkey.nse" }
-Entry{ category = "intrusive", filename = "ssh-hostkey.nse" }
-Entry{ category = "default", filename = "mysql-info.nse" }
-Entry{ category = "discovery", filename = "mysql-info.nse" }
-Entry{ category = "safe", filename = "mysql-info.nse" }
-Entry{ category = "default", filename = "finger.nse" }
-Entry{ category = "discovery", filename = "finger.nse" }
-Entry{ category = "discovery", filename = "whois.nse" }
-Entry{ category = "external", filename = "whois.nse" }
-Entry{ category = "safe", filename = "whois.nse" }
-Entry{ category = "discovery", filename = "http-trace.nse" }
-Entry{ category = "intrusive", filename = "http-passwd.nse" }
-Entry{ category = "vuln", filename = "http-passwd.nse" }
-Entry{ category = "discovery", filename = "sniffer-detect.nse" }
-Entry{ category = "version", filename = "iax2-version.nse" }
-Entry{ category = "default", filename = "smb-os-discovery.nse" }
-Entry{ category = "discovery", filename = "smb-os-discovery.nse" }
-Entry{ category = "safe", filename = "smb-os-discovery.nse" }
-Entry{ category = "intrusive", filename = "snmp-brute.nse" }
-Entry{ category = "auth", filename = "snmp-brute.nse" }
-Entry{ category = "default", filename = "identd-owners.nse" }
-Entry{ category = "safe", filename = "identd-owners.nse" }
-Entry{ category = "default", filename = "html-title.nse" }
-Entry{ category = "safe", filename = "html-title.nse" }
-Entry{ category = "external", filename = "dns-random-srcport.nse" }
-Entry{ category = "intrusive", filename = "dns-random-srcport.nse" }
-Entry{ category = "discovery", filename = "smb-enum-domains.nse" }
-Entry{ category = "intrusive", filename = "smb-enum-domains.nse" }
-Entry{ category = "discovery", filename = "smb-server-stats.nse" }
-Entry{ category = "intrusive", filename = "smb-server-stats.nse" }
-Entry{ category = "default", filename = "ftp-bounce.nse" }
-Entry{ category = "intrusive", filename = "ftp-bounce.nse" }
-Entry{ category = "discovery", filename = "smb-security-mode.nse" }
-Entry{ category = "safe", filename = "smb-security-mode.nse" }
-Entry{ category = "discovery", filename = "smb-enum-shares.nse" }
-Entry{ category = "intrusive", filename = "smb-enum-shares.nse" }
-Entry{ category = "default", filename = "http-open-proxy.nse" }
-Entry{ category = "discovery", filename = "http-open-proxy.nse" }
-Entry{ category = "external", filename = "http-open-proxy.nse" }
-Entry{ category = "intrusive", filename = "http-open-proxy.nse" }
-Entry{ category = "intrusive", filename = "sql-injection.nse" }
-Entry{ category = "vuln", filename = "sql-injection.nse" }
-Entry{ category = "default", filename = "realvnc-auth-bypass.nse" }
-Entry{ category = "vuln", filename = "realvnc-auth-bypass.nse" }
-Entry{ category = "version", filename = "skypev2-version.nse" }
-Entry{ category = "default", filename = "http-auth.nse" }
-Entry{ category = "auth", filename = "http-auth.nse" }
-Entry{ category = "intrusive", filename = "http-auth.nse" }
-Entry{ category = "auth", filename = "telnet-brute.nse" }
-Entry{ category = "intrusive", filename = "telnet-brute.nse" }
-Entry{ category = "auth", filename = "xampp-default-auth.nse" }
-Entry{ category = "vuln", filename = "xampp-default-auth.nse" }
-Entry{ category = "demo", filename = "smtp-open-relay.nse" }
-Entry{ category = "default", filename = "snmp-sysdescr.nse" }
-Entry{ category = "discovery", filename = "snmp-sysdescr.nse" }
-Entry{ category = "safe", filename = "snmp-sysdescr.nse" }
+Entry{ category = "malware", filename = "auth-spoof.nse" }
+Entry{ category = "intrusive", filename = "pop3-brute.nse" }
+Entry{ category = "auth", filename = "pop3-brute.nse" }
diff --git a/scripts/smb-checkvulns.nse b/scripts/smb-check-vulns.nse
similarity index 100%
rename from scripts/smb-checkvulns.nse
rename to scripts/smb-check-vulns.nse