diff --git a/middleman-core/features/builder.feature b/middleman-core/features/builder.feature
index f833b8bc..b3a19344 100644
--- a/middleman-core/features/builder.feature
+++ b/middleman-core/features/builder.feature
@@ -14,6 +14,7 @@ Feature: Builder
       | images/Read me (example).txt                  |
       | images/Child folder/regular_file(example).txt |
       | .htaccess                                     |
+      | feed.xml                                      |
     Then the following files should not exist:
       | _partial                                      |
       | layout                                        |
diff --git a/middleman-core/fixtures/large-build-app/source/feed.xml.builder b/middleman-core/fixtures/large-build-app/source/feed.xml.builder
new file mode 100644
index 00000000..9c9d6dbd
--- /dev/null
+++ b/middleman-core/fixtures/large-build-app/source/feed.xml.builder
@@ -0,0 +1,4 @@
+xml.instruct!
+xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
+  xml.title "Not a feed, really"
+end
\ No newline at end of file
diff --git a/middleman-core/lib/middleman-core/watcher.rb b/middleman-core/lib/middleman-core/watcher.rb
index e84faf99..e60f18d3 100644
--- a/middleman-core/lib/middleman-core/watcher.rb
+++ b/middleman-core/lib/middleman-core/watcher.rb
@@ -17,12 +17,13 @@ module Middleman
       
       def ignore_list
         [
-          /\.sass-cache/,
+          /\.sass-cache\//,
           /\.git/,
-          /\.DS_Store/,
-          /build/,
-          /\.rbenv-version/,
-          /Gemfile/,
+          /\.DS_Store$/,
+          /build\//,
+          /\.rbenv-version$/,
+          /Gemfile$/,
+          /Gemfile\.lock$/,
           /\.mm-pid/
         ]
       end
@@ -179,4 +180,4 @@ module Middleman
       Net::HTTP.post_form(uri, {}.merge(params))
     end
   end
-end
\ No newline at end of file
+end