diff --git a/CHANGELOG b/CHANGELOG
index 60e93e4b0..604943a11 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o [GH#629][NSE] Added two new fingerprints to http-default-accounts
+  (APC Management Card, older NetScreen ScreenOS) [xelphene, nposter]
+
 o [GH#716][NSE] Fix for oracle-tns-version which was sending an invalid TNS
   probe due to a string escaping mixup. [Alexandr Savca]
 
diff --git a/nselib/data/http-default-accounts-fingerprints.lua b/nselib/data/http-default-accounts-fingerprints.lua
index 8ea9a7fc8..823320ee0 100644
--- a/nselib/data/http-default-accounts-fingerprints.lua
+++ b/nselib/data/http-default-accounts-fingerprints.lua
@@ -1169,6 +1169,25 @@ table.insert(fingerprints, {
   end
 })
 
+table.insert(fingerprints, {
+  -- Version 416.7.I on Smart-UPS RT 2000 XL, 530.1800.D on APC Symmetra 80K,
+  --         652.19.D on Smart-UPS 1000, 3.4.4 on PDU AP7900
+  name = "APC Management Card",
+  category = "industrial",
+  paths = {
+    {path = "/"}
+  },
+  target_check = function (host, port, path, response)
+    return http_auth_realm(response) == "APC Management Card"
+  end,
+  login_combos = {
+    {username = "apc", password = "apc"}
+  },
+  login_check = function (host, port, path, user, pass)
+    return try_http_basic_login(host, port, path, user, pass)
+  end
+})
+
 ---
 --Printers
 ---