diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index bcf00ee033..3a4774a33d 100644
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -711,7 +711,7 @@ string const InsetGraphics::prepareFile(Buffer const & buf,
 		                                      output_to_file);
 		runparams.exportdata->addExternalFile("dvi", to_file,
 		                                      output_to_file);
-		return stripExtensionIfPossible(output_file);
+		return stripExtensionIfPossible(output_to_file);
 	}
 
 	lyxerr[Debug::GRAPHICS]
@@ -727,7 +727,7 @@ string const InsetGraphics::prepareFile(Buffer const & buf,
 				to_file, output_to_file);
 	}
 
-	return stripExtensionIfPossible(output_file);
+	return stripExtensionIfPossible(output_to_file);
 }
 
 
diff --git a/status.14x b/status.14x
index 29637962ed..0f51944bef 100644
--- a/status.14x
+++ b/status.14x
@@ -125,6 +125,9 @@ What's new
 
 - Read filenames with spaces in external insets correctly from .lyx files
 
+- Use the correct filename extension of included graphics in latex export if
+  it cannot be omitted.
+
 * USER INTERFACE:
 
 - Fix slowness with lots of math on Windows (bug 2900).