diff --git a/README b/README
index ca4161448..73104636f 100644
--- a/README
+++ b/README
@@ -127,7 +127,8 @@ Production of a PDF requires that a LaTeX engine be installed (see
 `--latex-engine`, below), and assumes that the following LaTeX packages are
 available: `amssymb`, `amsmath`, `ifxetex`, `ifluatex`, `listings` (if the
 `--listings` option is used), `fancyvrb`, `longtable`, `booktabs`, `url`,
-`graphicx`, `hyperref`, `ulem`, `babel` (if the `lang` variable is set),
+`graphicx` and `grffile` (if the document contains images),
+ `hyperref`, `ulem`, `babel` (if the `lang` variable is set),
 `fontspec` (if `xelatex` or `lualatex` is used as the LaTeX engine), `xltxtra`
 and `xunicode` (if `xelatex` is used).
 
diff --git a/data/templates b/data/templates
index 09767991b..12ba81ec9 160000
--- a/data/templates
+++ b/data/templates
@@ -1 +1 @@
-Subproject commit 09767991b2a8945f5739d47c44d171e37e65e0de
+Subproject commit 12ba81ec9697e238c861ca6b7f8dc08f4e876e7b
diff --git a/tests/writer.latex b/tests/writer.latex
index f7123be98..94e8f779e 100644
--- a/tests/writer.latex
+++ b/tests/writer.latex
@@ -25,7 +25,7 @@
 }{}
 \usepackage{fancyvrb}
 \VerbatimFootnotes
-\usepackage{graphicx}
+\usepackage{graphicx,grffile}
 \makeatletter
 \def\maxwidth{\ifdim\Gin@nat@width>\linewidth\linewidth\else\Gin@nat@width\fi}
 \def\maxheight{\ifdim\Gin@nat@height>\textheight\textheight\else\Gin@nat@height\fi}