diff --git a/CHANGELOG b/CHANGELOG
index bfe4787b3..a2a1773c5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o [NSE] Added http-qnap-nas-info, that retrieves the model, firware version,
+  and enabled services from a QNAP Network Attached Storage (NAS) device.
+  [Brendan Coles]
+
 o [NSE] Fixed a bunch of global access errors in various libraries reported by
   the nse_check_globals script. [Patrik]
 
diff --git a/scripts/http-qnap-nas-info.nse b/scripts/http-qnap-nas-info.nse
new file mode 100644
index 000000000..619f8d291
--- /dev/null
+++ b/scripts/http-qnap-nas-info.nse
@@ -0,0 +1,109 @@
+description = [[
+Attempts to retrieve the model, firware version, and enabled services from a 
+QNAP Network Attached Storage (NAS) device.
+]]
+
+---
+-- @usage
+-- nmap --script http-qnap-nas-info -p <port> <host>
+--
+-- @output
+-- PORT   STATE SERVICE   REASON
+-- 443/tcp open  https   syn-ack
+-- | http-qnap-nas-info: 
+-- |   Device Model: TS-859
+-- |   Firmware Version: 3.2.5
+-- |   Firmware Build: 0410T
+-- |   Force SSL: 0
+-- |   SSL Port: 443
+-- |   WebFS Enabled: 1
+-- |   Multimedia Station Enabled: 0
+-- |   Multimedia Station V2 Supported: 1
+-- |   Multimedia Station V2 Web Enabled: 0
+-- |   Download Station Enabled: 0
+-- |   Network Video Recorder Enabled: 0
+-- |   Web File Manager Enabled: 1
+-- |   QWeb Server Enabled: 1
+-- |   QWeb Server Port: 80
+-- |   Qweb Server SSL Enabled: 0
+-- |_  Qweb Server SSL Port: 8081
+--
+-- @changelog
+-- 2012-01-29 - created by Brendan Coles - itsecuritysolutions.org
+--
+
+author = "Brendan Coles [itsecuritysolutions.org]"
+license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
+categories = {"safe","discovery"}
+
+require("url")
+require("http")
+require("stdnse")
+require("shortport")
+
+portrule = shortport.port_or_service ({443,8080}, "https", "tcp")
+
+action = function(host, port)
+
+	local result = {}
+	local path = "/cgi-bin/authLogin.cgi"
+	local config_file = ""
+
+	-- Retrieve file
+	stdnse.print_debug(1, ("%s: Connecting to %s:%s"):format(SCRIPT_NAME, host.targetname or host.ip, port.number))
+	data = http.get(host, port, path)
+
+	-- Check if file exists
+	if data and data.status and data.status == 200 and data.body and data.body ~= "" then
+
+		-- Check if the config file is valid
+		stdnse.print_debug(1, "%s: HTTP %s: %s", SCRIPT_NAME, data.status, path)
+		if string.match(data.body, '<QDocRoot version="[^"]+">') then
+			config_file = data.body
+		else
+			stdnse.print_debug(1, ("%s: %s:%s uses an invalid config file."):format(SCRIPT_NAME, host.targetname or host.ip, port.number))
+			return
+		end
+
+	else
+		stdnse.print_debug(1, "%s: Failed to retrieve file: %s", SCRIPT_NAME, path)
+		return
+	end
+
+	-- Extract system info from config file
+	stdnse.print_debug(1, "%s: Extracting system info from %s", SCRIPT_NAME, path)
+	local vars = {
+
+		-- System details --
+		--{"Hostname","hostname"},
+		{"Device Model", "internalModelName"},
+		{"Firmware Version","version"},
+		{"Firmware Build","build"},
+
+		-- SSL --
+		{"Force SSL","forceSSL"},
+		{"SSL Port","stunnelPort"},
+
+		-- Services --
+		{"WebFS Enabled","webFSEnabled"},
+		{"Multimedia Station Enabled","QMultimediaEnabled"},
+		{"Multimedia Station V2 Supported","MSV2Supported"},
+		{"Multimedia Station V2 Web Enabled","MSV2WebEnabled"},
+		{"Download Station Enabled","QDownloadEnabled"},
+		{"Network Video Recorder Enabled","NVREnabled"},
+		{"Web File Manager Enabled","WFM2"},
+		{"QWeb Server Enabled","QWebEnabled"},
+		{"QWeb Server Port","QWebPort"},
+		{"Qweb Server SSL Enabled","QWebSSLEnabled"},
+		{"Qweb Server SSL Port","QWebSSLPort"},
+
+	}
+	for _, var in ipairs(vars) do
+		local var_match = string.match(config_file, string.format('<%s><!.CDATA.(.+)..><\/%s>', var[2], var[2]))
+		if var_match then table.insert(result, string.format("%s: %s", var[1], var_match)) end
+	end
+
+	-- Return results
+	return stdnse.format_output(true, result)
+
+end
diff --git a/scripts/script.db b/scripts/script.db
index d878a1e4a..a542f8fa2 100644
--- a/scripts/script.db
+++ b/scripts/script.db
@@ -130,6 +130,7 @@ Entry { filename = "http-passwd.nse", categories = { "intrusive", "vuln", } }
 Entry { filename = "http-php-version.nse", categories = { "discovery", "safe", } }
 Entry { filename = "http-proxy-brute.nse", categories = { "brute", "external", "intrusive", } }
 Entry { filename = "http-put.nse", categories = { "discovery", "intrusive", } }
+Entry { filename = "http-qnap-nas-info.nse", categories = { "discovery", "safe", } }
 Entry { filename = "http-robots.txt.nse", categories = { "default", "discovery", "safe", } }
 Entry { filename = "http-robtex-reverse-ip.nse", categories = { "discovery", "external", "safe", } }
 Entry { filename = "http-title.nse", categories = { "default", "discovery", "safe", } }