diff --git a/modules/browser/browser_fingerprinting/command.js b/modules/browser/browser_fingerprinting/command.js
index 78762f81e..a61f243ca 100644
--- a/modules/browser/browser_fingerprinting/command.js
+++ b/modules/browser/browser_fingerprinting/command.js
@@ -34,12 +34,15 @@ beef.execute(function() {
 
 	// Browser fingerprints // in the form of: "URI","Browser","version(s)"
 	var fingerprints = new Array(
-		new Array("Firefox","moz-icon://.autoreg?size=16"),
-		new Array("Firefox","2.x","resource:///res/html/gopher-audio.gif"),
-		new Array("Firefox","2.x-3.x","jar:resource:///chrome/classic.jar!/skin/classic/browser/Secure.png"),
-		new Array("Firefox","4.x-5.x","resource:///chrome/browser/skin/classic/browser/Secure.png"),
+		new Array("Safari","1+","feed://__rsrc__/__rsrc__/NextPage.tif"),
+		new Array("Firefox","1+","moz-icon://.autoreg?size=16"),
+		new Array("Firefox","2","resource:///res/html/gopher-audio.gif"),
+		new Array("Firefox","2-3","jar:resource:///chrome/classic.jar!/skin/classic/browser/Secure.png"),
+		new Array("Firefox","4-5","resource:///chrome/browser/skin/classic/browser/Secure.png"),
+		new Array("Firefox","1-6","resource:///chrome/browser/content/branding/icon128.png"),
 		new Array("Firefox","4+","resource:///chrome/browser/skin/classic/browser/Geolocation-16.png"),
-		new Array("Internet Explorer","5.x-6.x","res://shdoclc.dll/pagerror.gif"),
+		new Array("Firefox","7+","resource:///chrome/browser/content/browser/aboutHome-snippet1.png"),
+		new Array("Internet Explorer","5-6","res://shdoclc.dll/pagerror.gif"),
 		new Array("Internet Explorer","7+","res://ieframe.dll/info_48.png")
 	);
 
diff --git a/modules/browser/browser_fingerprinting/config.yaml b/modules/browser/browser_fingerprinting/config.yaml
index 5754f8ee6..323183436 100644
--- a/modules/browser/browser_fingerprinting/config.yaml
+++ b/modules/browser/browser_fingerprinting/config.yaml
@@ -19,8 +19,8 @@ beef:
             enable: true
             category: "Browser"
             name: "Fingerprint Browser"
-            description: "This module attempts to fingerprint the browser type and version using URI handlers unique to Internet Explorer and Mozilla Firefox. This method does not rely on JavaScript objects which may have been modified by the user or browser compatibility mode."
+            description: "This module attempts to fingerprint the browser type and version using URI handlers unique to Safari, Internet Explorer and Mozilla Firefox. This method does not rely on JavaScript objects which may have been modified by the user or browser compatibility mode."
             authors: ["bcoles"]
             target:
-                working: ["IE", "FF"]
+                working: ["IE", "FF", "S"]
                 not_working: ["ALL"]