diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index b80aa944e050edcfe6cb05c6c48b2d3f0cb45b65..cc7fecb28a4b132845817a8597416e5c7173bdb4 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Fix `rake notes` to look into `*.sass` files
+
+    *Yuri Artemev*
+
 *   Removed deprecated `Rails.application.railties.engines`.
 
     *Arun Agrawal*
diff --git a/railties/lib/rails/source_annotation_extractor.rb b/railties/lib/rails/source_annotation_extractor.rb
index 2cbb0a435c3ed81b36171a29866c7b93fd92ac97..290634290fd85d93cb3569c8a177311d457cc14c 100644
--- a/railties/lib/rails/source_annotation_extractor.rb
+++ b/railties/lib/rails/source_annotation_extractor.rb
@@ -82,7 +82,7 @@ def find_in(dir)
             case item
             when /\.(builder|rb|coffee|rake)$/
               /#\s*(#{tag}):?\s*(.*)$/
-            when /\.(css|scss|js)$/
+            when /\.(css|scss|sass|js)$/
               /\/\/\s*(#{tag}):?\s*(.*)$/
             when /\.erb$/
               /<%\s*#\s*(#{tag}):?\s*(.*?)\s*%>/
diff --git a/railties/test/application/rake/notes_test.rb b/railties/test/application/rake/notes_test.rb
index 3508f4225a847f69d5c82a8cd2b5ae405e3e80d0..9a92c5f6ffb467b1caec8f3003c5b21f3dd0748f 100644
--- a/railties/test/application/rake/notes_test.rb
+++ b/railties/test/application/rake/notes_test.rb
@@ -24,6 +24,7 @@ def teardown
         app_file "app/assets/javascripts/application.js", "// TODO: note in js"
         app_file "app/assets/stylesheets/application.css", "// TODO: note in css"
         app_file "app/assets/stylesheets/application.css.scss", "// TODO: note in scss"
+        app_file "app/assets/stylesheets/application.css.sass", "// TODO: note in sass"
         app_file "app/controllers/application_controller.rb", 1000.times.map { "" }.join("\n") << "# TODO: note in ruby"
         app_file "lib/tasks/task.rake", "# TODO: note in rake"
 
@@ -46,9 +47,10 @@ def teardown
           assert_match(/note in js/, output)
           assert_match(/note in css/, output)
           assert_match(/note in scss/, output)
+          assert_match(/note in sass/, output)
           assert_match(/note in rake/, output)
 
-          assert_equal 9, lines.size
+          assert_equal 10, lines.size
 
           lines.each do |line|
             assert_equal 4, line[0].size