diff --git a/CHANGELOG b/CHANGELOG
index 97d4de223..8afb448ec 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,12 +1,15 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o Added PPTP version detection NSE script (PPTPversion.nse) from
+  Thomas Buchanan.  Nmap now ships with 38 NSE scripts.
+
 o Reworded an error message after a woman reported that it was "highly
   offensive and sexist".  She also noted that "times have changed and
   many women now use your software" and "a sexist remark like the one
   above should have no place in software."  The message was: "TCP/IP
   fingerprinting (for OS scan) requires root privileges. Sorry,
   dude.".  I checked svn blame to call out the insensitive,
-  chauvinistic jerk who wrote that error message, but it was me. Oops.
+  chauvinistic jerk who wrote that message, but it was me. Oops :).
 
 o We received a bug report through Debian entitled "Nmap is a
   clairvoyant" because when you run it with -v on September 1 1970, it
diff --git a/scripts/PPTPversion.nse b/scripts/PPTPversion.nse
new file mode 100644
index 000000000..25b0bd1e7
--- /dev/null
+++ b/scripts/PPTPversion.nse
@@ -0,0 +1,126 @@
+-- PPTP information gathering script
+-- rev 0.2 (11-14-2007)
+
+id = "PPTP"
+
+description = "Attempts to extract system information from PPTP service"
+
+author = "Thomas Buchanan <tbuchanan@thecompassgrp.net>"
+
+license = "See nmaps COPYING for licence"
+
+categories = {"version"}
+
+portrule = function(host, port) 
+	if 
+		port.number == 1723
+		and port.protocol == "tcp"
+		and port.state == "open"
+	then
+		return true
+	else
+		return false
+	end
+end
+
+action = function(host, port)
+
+	-- create the socket used for our connection
+	local socket = nmap.new_socket()
+	
+	-- set a reasonable timeout value
+	socket:set_timeout(5000)
+	
+	-- do some exception handling / cleanup
+	local catch = function()
+		socket:close()
+	end
+	
+	local try = nmap.new_try(catch)
+	
+	-- connect to the potential PPTP service
+	try(socket:connect(host.ip, port.number, "tcp"))
+	
+	local payload
+	  
+	-- build a PPTP Start-Control-Connection-Request packet
+	-- copied from packet capture of pptp exchange
+	-- for details of packet structure, see http://www.ietf.org/rfc/rfc2637.txt
+	payload = "\000\156\000\001\026\043\060\077" -- length=156, Message type=control, cookie
+	payload = payload .. "\000\001\000\000\001\000\000\000" -- Control type=Start-Control-Connection-Request, Reserved, Protocol=1.0, Reserverd
+	payload = payload .. "\000\000\000\001\000\000\000\001" -- Framing Capabilities, Bearer Capabilities
+	payload = payload .. "\255\255\000\001" .. "none" -- Maximum channels, firmware version, hostname
+	payload = payload .. "\000\000\000\000\000\000\000\000" -- padding for hostname
+	payload = payload .. "\000\000\000\000\000\000\000\000" -- padding for hostname
+	payload = payload .. "\000\000\000\000\000\000\000\000" -- padding for hostname
+	payload = payload .. "\000\000\000\000\000\000\000\000" -- padding for hostname
+	payload = payload .. "\000\000\000\000\000\000\000\000" -- padding for hostname
+	payload = payload .. "\000\000\000\000\000\000\000\000" -- padding for hostname
+	payload = payload .. "\000\000\000\000\000\000\000\000" -- padding for hostname
+	payload = payload .. "\000\000\000\000" .. "nmap" -- padding for hostname, vendor name
+	payload = payload .. "\000\000\000\000\000\000\000\000" -- padding for vendor name
+	payload = payload .. "\000\000\000\000\000\000\000\000" -- padding for vendor name
+	payload = payload .. "\000\000\000\000\000\000\000\000" -- padding for vendor name
+	payload = payload .. "\000\000\000\000\000\000\000\000" -- padding for vendor name
+	payload = payload .. "\000\000\000\000\000\000\000\000" -- padding for vendor name
+	payload = payload .. "\000\000\000\000\000\000\000\000" -- padding for vendor name
+	payload = payload .. "\000\000\000\000\000\000\000\000" -- padding for vendor name
+	payload = payload .. "\000\000\000\000" -- padding for vendor name
+
+	try(socket:send(payload))
+	
+	local status
+	local response
+	
+	-- read in any response we might get
+	status, response = socket:receive_bytes(1)
+
+	if (not status) then
+		return
+	end
+
+	if (response == "TIMEOUT") then
+		return
+	end
+
+	try(socket:close())
+	
+	local result
+		
+	-- check to see if the packet we got back matches the beginning of a PPTP Start-Control-Connection-Reply packet
+	result = string.match(response, "%z\156%z\001\026\043(.*)")
+	local output
+	
+	if result ~= nil then
+		local firmware
+		local hostname
+		local vendor
+		
+		-- get the firmware version (2 octets) 
+		local s1,s2
+		s1,s2 = string.byte(result, 22, 23)
+		firmware = s1 * 256 + s2
+
+		-- get the hostname (64 octets)
+		local s3
+		s3 = string.sub(result, 24, 87)
+		hostname = string.match(s3, "(.-)%z")
+
+		-- get the vendor (should be 64 octets, but capture to end of the string to be safe)
+		local s4, length
+		length = string.len(result)
+		s4 = string.sub(result, 88, length)
+		vendor = string.match(s4, "(.-)%z")
+	
+		port.version.name = "pptp"
+		port.version.name_confidence = 10
+		if vendor ~= nil then port.version.product = vendor end
+		if firmware ~= 0 then port.version.version = "(Firmware: " .. firmware .. ")" end
+		if hostname ~= nil then port.version.hostname = hostname end
+		
+		port.version.service_tunnel = "none"
+		port.version.fingerprint = nil
+		nmap.set_port_version(host, port, "hardmatched")
+	end
+
+end
diff --git a/scripts/script.db b/scripts/script.db
index 0c8b45a4b..9115f2fa1 100644
--- a/scripts/script.db
+++ b/scripts/script.db
@@ -4,6 +4,7 @@ Entry{ category = "intrusive", filename = "HTTPpasswd.nse" }
 Entry{ category = "discovery", filename = "HTTPtrace.nse" }
 Entry{ category = "discovery", filename = "MSSQLm.nse" }
 Entry{ category = "intrusive", filename = "MSSQLm.nse" }
+Entry{ category = "version", filename = "PPTPversion.nse" }
 Entry{ category = "backdoor", filename = "RealVNC_auth_bypass.nse" }
 Entry{ category = "demo", filename = "SMTP_openrelay_test.nse" }
 Entry{ category = "discovery", filename = "SMTPcommands.nse" }