diff --git a/src/General/Config.coffee b/src/General/Config.coffee
index 1e93e5945..2e84d8ce3 100755
--- a/src/General/Config.coffee
+++ b/src/General/Config.coffee
@@ -654,12 +654,12 @@ Config =
     MD5: ''
 
   sauces: """
-    https://www.google.com/searchbyimage?image_url=%TURL
-    http://iqdb.org/?url=%TURL
+    https://www.google.com/searchbyimage?image_url=%IMG
+    http://iqdb.org/?url=%IMG
     http://eye.swfchan.com/search/?q=%name;types:swf
-    #//tineye.com/search?url=%TURL
-    #//saucenao.com/search.php?url=%TURL
-    #http://3d.iqdb.org/?url=%TURL
+    #//tineye.com/search?url=%IMG
+    #//saucenao.com/search.php?url=%IMG
+    #http://3d.iqdb.org/?url=%IMG
     #http://regex.info/exif.cgi?imgurl=%URL
     # uploaders:
     #//imgur.com/upload?url=%URL;text:Upload to imgur
@@ -671,9 +671,6 @@ Config =
     #https://rbt.asia/%board/image/%MD5;text:View same on RBT /%board/;boards:<%=
       grunt.file.readJSON('src/Archive/archives.json').filter(function(x) {return x.uid === 8})[0].files.join(',')
     %>
-    # Search with full image only for image file types:
-    #https://www.google.com/searchbyimage?image_url=%URL;types:gif,jpg,png
-    #https://www.google.com/searchbyimage?image_url=%TURL;types:webm,pdf
   """
 
   FappeT:
diff --git a/src/General/html/Settings/Sauce.html b/src/General/html/Settings/Sauce.html
index 2bc2db741..ff1c76644 100755
--- a/src/General/html/Settings/Sauce.html
+++ b/src/General/html/Settings/Sauce.html
@@ -6,6 +6,7 @@
 <ul>These parameters will be replaced by their corresponding values:
   <li><code>%TURL</code>: Thumbnail URL.</li>
   <li><code>%URL</code>: Full image URL.</li>
+  <li><code>%IMG</code>: Full image URL for GIF, JPG, and PNG; thumbnail URL for other types.</li>
   <li><code>%MD5</code>: MD5 hash.</li>
   <li><code>%name</code>: Original file name.</li>
   <li><code>%board</code>: Current board.</li>
diff --git a/src/Images/Sauce.coffee b/src/Images/Sauce.coffee
index 5479914a0..d68f9c8d5 100755
--- a/src/Images/Sauce.coffee
+++ b/src/Images/Sauce.coffee
@@ -26,14 +26,16 @@ Sauce =
       else
         m = part.match /^(\w*):(.*)$/
         parts[m[1]] = m[2]
-
     parts['text'] or= parts['url'].match(/(\w+)\.\w+\//)?[1] or '?'
+    ext = post.file.URL.match(/[^.]*$/)[0]
+
     skip = false
     for key of parts
-      parts[key] = parts[key].replace /%(T?URL|MD5|board|name|%|semi)/g, (parameter) ->
+      parts[key] = parts[key].replace /%(T?URL|IMG|MD5|board|name|%|semi)/g, (parameter) ->
         type = {
           '%TURL':  post.file.thumbURL
           '%URL':   post.file.URL
+          '%IMG':   if ext in ['gif', 'jpg', 'png'] then post.file.URL else post.file.thumbURL
           '%MD5':   post.file.MD5
           '%board': post.board.ID
           '%name':  post.file.name
@@ -50,10 +52,9 @@ Sauce =
         type
 
     return null if skip
-
-    ext = post.file.URL.match(/\.([^\.]*)$/)?[1] or ''
     return null unless !parts['boards'] or post.board.ID in parts['boards'].split ','
     return null unless !parts['types']  or ext           in parts['types'].split  ','
+
     a = Sauce.link.cloneNode true
     a.href = parts['url']
     a.textContent = parts['text']