diff --git a/src/General/Settings/Sauce.html b/src/General/Settings/Sauce.html
index bee13122d..6f35c88cf 100644
--- a/src/General/Settings/Sauce.html
+++ b/src/General/Settings/Sauce.html
@@ -18,7 +18,7 @@
   </ul>
   <div>Lines starting with a <code>#</code> will be ignored.</div>
   <div>You can specify a display text by appending <code>;text:[text]</code> to the URL.</div>
-  <div>You can specify the applicable boards by appending <code>;boards:[board1],[board2]</code>.</div>
+  <div>You can specify the applicable boards/sites by appending <code>;boards:[board1],[board2]</code>. See the Filter guide for details.</div>
   <div>You can specify the applicable file types by appending <code>;types:[extension1],[extension2]</code>.</div>
   <div>You can specify a regular expression the filename must match by appending <code>;regexp:[regular expression]</code>.</div>
 </div>
diff --git a/src/Images/Sauce.coffee b/src/Images/Sauce.coffee
index b36f3fa74..b7717daa2 100644
--- a/src/Images/Sauce.coffee
+++ b/src/Images/Sauce.coffee
@@ -26,6 +26,8 @@ Sauce =
         m = part.match /^(\w*):?(.*)$/
         parts[m[1]] = m[2]
     parts['text'] or= parts['url'].match(/(\w+)\.\w+\//)?[1] or '?'
+    if 'boards' of parts
+      parts['boards'] = Filter.parseBoards parts['boards']
     if 'regexp' of parts
       try
         if (regexp = parts['regexp'].match /^\/(.*)\/(\w*)$/)
@@ -48,8 +50,8 @@ Sauce =
     parts = {}
     $.extend parts, link
 
-    return null unless !parts['boards'] or post.board.ID in parts['boards'].split ','
-    return null unless !parts['types']  or ext           in parts['types'].split  ','
+    return null unless !parts['boards'] or parts['boards']["#{post.siteID}/#{post.boardID}"] or parts['boards']["#{post.siteID}/*"]
+    return null unless !parts['types']  or ext in parts['types'].split(',')
     return null unless !parts['regexp'] or (matches = file.name.match parts['regexp'])
 
     missing = []