2 files changed, 7 insertions, 1 deletions

diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 323895927a9..1ba91235759 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -5205,7 +5205,9 @@ when the image does not have an associated file name, to provide a
 hint to ImageMagick to help it detect the image type.
 
 @item :rotation @var{angle}
-Specifies a rotation angle in degrees.
+Specifies a rotation angle in degrees.  If no rotation is explicitly
+specified, and the @acronym{EXIF} headers specify a rotation, the
+rotation from the @acronym{EXIF} headers are used instead.
 
 @item :index @var{frame}
 @c Doesn't work: http://debbugs.gnu.org/7978
diff --git a/etc/NEWS b/etc/NEWS
index 70f9476e71e..c1338680541 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -634,6 +634,10 @@ text in the region.  The search engine to use for this is specified by
 the customizable variable `eww-search-prefix'.
 
 +++
+*** Images that have rotation specified in the EXIF headers are now
+automatically rotated (if displayed as ImageMagick images).
+
++++
 *** Query-replace history is enhanced.
 When query-replace reads the FROM string from the minibuffer, typing
 `M-p' will now show previous replacements as "FROM SEP TO", where FROM