diff --git a/lib/redmine/thumbnail.rb b/lib/redmine/thumbnail.rb
index 5779551da..ab3c4f1bf 100644
--- a/lib/redmine/thumbnail.rb
+++ b/lib/redmine/thumbnail.rb
@@ -38,7 +38,7 @@ module Redmine
           FileUtils.mkdir_p directory
         end
         size_option = "#{size}x#{size}>"
-        cmd = "#{shell_quote CONVERT_BIN} #{shell_quote source} -thumbnail #{shell_quote size_option} #{shell_quote target}"
+        cmd = "#{shell_quote CONVERT_BIN} #{shell_quote source} -auto-orient -thumbnail #{shell_quote size_option} #{shell_quote target}"
         unless system(cmd)
           logger.error("Creating thumbnail failed (#{$?}):\nCommand: #{cmd}")
           return nil
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 6b04d9b7c..1a46ac16d 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1512,3 +1512,7 @@ color: #555; text-shadow: 1px 1px 0 #fff;
   height:1px;
   overflow:hidden;
 }
+
+img {
+  image-orientation: from-image;
+}