diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index b75d79a316..017ce426eb 100644
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -603,10 +603,10 @@ string const InsetGraphics::prepareFile(Buffer const & buf,
 	// buffer.
 	// "nice" means that the buffer is exported to LaTeX format but not
 	//        run through the LaTeX compiler.
-	string const output_file = os::external_path(runparams.nice ?
+	string output_file = os::external_path(runparams.nice ?
 		params().filename.outputFilename(m_buffer->filePath()) :
 		OnlyFilename(temp_file));
-	string const source_file = runparams.nice ? orig_file : temp_file;
+	string source_file = runparams.nice ? orig_file : temp_file;
 
 	if (zipped) {
 		if (params().noUnzip) {
@@ -644,6 +644,8 @@ string const InsetGraphics::prepareFile(Buffer const & buf,
 		}
 
 		string const unzipped_temp_file = unzippedFileName(temp_file);
+		output_file = unzippedFileName(output_file);
+		source_file = unzippedFileName(source_file);
 		if (compare_timestamps(unzipped_temp_file, temp_file) > 0) {
 			// temp_file has been unzipped already and
 			// orig_file has not changed in the meantime.
diff --git a/status.14x b/status.14x
index 507eeb4ffb..ce3a5f3557 100644
--- a/status.14x
+++ b/status.14x
@@ -124,6 +124,8 @@ What's new
 - Reading the bounding box from eps files does not fail anymore when the
   file contains additional spaces (bug 1235)
 
+- Fix LaTeX error for zipped graphics (bug 2231).
+
 * Configuration/Installation:
 
 - Don't use the -mms-bitfields compiler switch on mingw and cygwin, since