diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d323dda..768b0492 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 3.0.12
 ===
 
+* Update to listen 0.7.x. No longer depend on rb-inotify. *nix users should add to Gemfile.
+* Support Haml 4
 * :debug_assets can no longer be turned on in the build environment.
 * Helpers now work with JS/CSS files with .erb processing.
 * Provide an informative exception when link_to is used improperly.
diff --git a/Gemfile b/Gemfile
index b0be8983..47e44b9d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,10 +15,10 @@ gem "rspec",    "~> 2.12"
 
 # Optional middleman dependencies, included for tests
 gem "sinatra"
-gem "slim", "~> 1.2.0"
-gem "liquid", "~> 2.2"
-gem "less", "~> 2.2"
-gem "stylus", "~> 0.6.2"
+gem "slim", "~> 1.2.0", :require => false
+gem "liquid", "~> 2.2", :require => false
+gem "less", "~> 2.2", :require => false
+gem "stylus", "~> 0.6.2", :require => false
 
 platforms :ruby do
   gem "therubyracer", "0.10.2"
diff --git a/middleman-core/middleman-core-x86-mingw32.gemspec b/middleman-core/middleman-core-x86-mingw32.gemspec
index d1779828..fafe732d 100644
--- a/middleman-core/middleman-core-x86-mingw32.gemspec
+++ b/middleman-core/middleman-core-x86-mingw32.gemspec
@@ -33,6 +33,6 @@ Gem::Specification.new do |s|
   s.add_dependency("activesupport", ["~> 3.2.6"])
   
   # Watcher
-  s.add_dependency("listen", ["~> 0.5.2"])
-  s.add_dependency("wdm", ["~> 0.0.3"]) # Windows
+  s.add_dependency("listen", ["~> 0.7.2"])
+  s.add_dependency("wdm", ["~> 0.1.0"]) # Windows
 end
diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec
index c366daa3..5162e829 100644
--- a/middleman-core/middleman-core.gemspec
+++ b/middleman-core/middleman-core.gemspec
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.add_dependency("activesupport", ["~> 3.2.6"])
   
   # Watcher
-  s.add_dependency("listen", ["~> 0.5.2"])
-  s.add_dependency("rb-fsevent", ["~> 0.9.1"]) # Linux
-  s.add_dependency("rb-inotify", ["~> 0.8.8"]) # OS X
+  s.add_dependency("listen", ["~> 0.7.2"])
+  s.add_dependency("rb-fsevent", ["~> 0.9.3"]) # OS X
+  # s.add_dependency("rb-inotify", ["~> 0.9.0"]) # Linux
 end