diff --git a/docs/content/extras/shortcodes.md b/docs/content/extras/shortcodes.md
index 34c6f3486..68dbb6681 100644
--- a/docs/content/extras/shortcodes.md
+++ b/docs/content/extras/shortcodes.md
@@ -211,6 +211,10 @@ pass the owner and the ID of the gist to the shortcode:
 
     {{</* gist spf13 7896402 */>}}
 
+If the gist contains several files and you want to quote just one of them, you can pass the filename (quoted) as an optional third argument:
+
+    {{</* gist spf13 7896402 "img.html" */>}}
+
 ### Speaker Deck
 
 To embed slides from [Speaker Deck](https://speakerdeck.com/), click on "&lt;&#8239;/&gt;&nbsp;Embed" (under Share right next to the template on Speaker Deck) and copy the URL, e.g.:
diff --git a/tpl/template_embedded.go b/tpl/template_embedded.go
index 53f5c0f5e..dae36a297 100644
--- a/tpl/template_embedded.go
+++ b/tpl/template_embedded.go
@@ -58,7 +58,7 @@ func (t *GoHTMLTemplate) EmbedShortcodes() {
   <iframe src="//player.vimeo.com/video/{{ .Get 0 }}" {{ if len .Params | eq 1 }}style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;" {{ end }}webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
  </div>
 {{ end }}`)
-	t.AddInternalShortcode("gist.html", `<script src="//gist.github.com/{{ index .Params 0 }}/{{ index .Params 1 }}.js"></script>`)
+	t.AddInternalShortcode("gist.html", `<script src="//gist.github.com/{{ index .Params 0 }}/{{ index .Params 1 }}.js{{if len .Params | eq 3 }}?file={{ index .Params 2 }}{{end}}"></script>`)
 	t.AddInternalShortcode("tweet.html", `{{ (getJSON "https://api.twitter.com/1/statuses/oembed.json?id=" (index .Params 0)).html | safeHTML }}`)
 }