diff --git a/middleman-core/Rakefile b/middleman-core/Rakefile
index 5f7f7fc2..dc58b608 100644
--- a/middleman-core/Rakefile
+++ b/middleman-core/Rakefile
@@ -1,7 +1,7 @@
 # coding:utf-8
 RAKE_ROOT = __FILE__
 
-GEM_NAME = "middleman-core"
+GEM_NAME = ENV["NAME"] || "middleman-core"
 
 require 'rubygems'
 require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')
diff --git a/middleman-core/middleman-core-x86-mingw32.gemspec b/middleman-core/middleman-core-x86-mingw32.gemspec
new file mode 100644
index 00000000..e4963b6e
--- /dev/null
+++ b/middleman-core/middleman-core-x86-mingw32.gemspec
@@ -0,0 +1,38 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "middleman-core/version"
+
+Gem::Specification.new do |s|
+  s.name        = "middleman-core"
+  s.version     = Middleman::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.license     = "MIT"
+  s.authors     = ["Thomas Reynolds", "Ben Hollis"]
+  s.email       = ["me@tdreyno.com", "ben@benhollis.net"]
+  s.homepage    = "http://middlemanapp.com"
+  s.summary     = "Hand-crafted frontend development"
+  s.description = "A static site generator. Provides dozens of templating languages (Haml, Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting, Yaml data (and more) an easy part of your development cycle."
+
+  s.files        = `git ls-files -z`.split("\0")
+  s.test_files   = `git ls-files -z -- {fixtures,features}/*`.split("\0")
+  s.executable   = "middleman"
+  s.require_path = "lib"
+  
+  # Core
+  s.add_dependency("bundler", ["~> 1.1"])
+  s.add_dependency("rack", ["~> 1.4.1"])
+  s.add_dependency("tilt", ["~> 1.3.1"])
+  
+  # Builder
+  s.add_dependency("rack-test", ["~> 0.6.1"])
+  
+  # CLI
+  s.add_dependency("thor", ["~> 0.15.4"])
+  
+  # Helpers
+  s.add_dependency("activesupport", ["~> 3.2.6"])
+  
+  # Watcher
+  s.add_dependency("listen", ["~> 0.5.0"])
+  s.add_dependency("wdm", ["~> 0.0.3"]) # Windows
+end
diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec
index a29be649..70c50aba 100644
--- a/middleman-core/middleman-core.gemspec
+++ b/middleman-core/middleman-core.gemspec
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
   s.add_dependency("activesupport", ["~> 3.2.6"])
   
   # Watcher
-  s.add_dependency("listen", ["~> 0.4.7"])
+  s.add_dependency("listen", ["~> 0.5.0"])
+  s.add_dependency("rb-fsevent", ["~> 0.9.1"]) # Linux
+  s.add_dependency("rb-inotify", ["~> 0.8.8"]) # OS X
 end
-