diff --git a/lib/redmine/themes.rb b/lib/redmine/themes.rb
index 57fcd80d7..873409d1e 100644
--- a/lib/redmine/themes.rb
+++ b/lib/redmine/themes.rb
@@ -148,7 +148,7 @@ module Redmine
     end
 
     def self.scan_themes
-      dirs = Dir.glob("#{Rails.root}/app/assets/themes/*").select do |f|
+      dirs = Dir.glob(["#{Rails.root}/app/assets/themes/*", "#{Rails.root}/themes/*"]).select do |f|
         # A theme should at least override application.css
         File.directory?(f) && File.exist?("#{f}/stylesheets/application.css")
       end
diff --git a/app/assets/themes/README b/themes/README
similarity index 100%
rename from app/assets/themes/README
rename to themes/README