diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec
index 08400465..8352958f 100644
--- a/middleman-core/middleman-core.gemspec
+++ b/middleman-core/middleman-core.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_path = "lib"
   
   # Core
-  s.add_dependency("bundler", ["~> 1.0"])
+  s.add_dependency("bundler", ["~> 1.1"])
   s.add_dependency("rack", ["~> 1.4.0"])
   s.add_dependency("tilt", ["~> 1.3.1"])
   
diff --git a/middleman/fixtures/.gitkeep b/middleman/fixtures/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman/middleman.gemspec b/middleman/middleman.gemspec
index 41606dbf..024e0170 100644
--- a/middleman/middleman.gemspec
+++ b/middleman/middleman.gemspec
@@ -13,7 +13,8 @@ Gem::Specification.new do |s|
   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`.split("\n")
+  s.files         = `git ls-files -z`.split("\0")
+  s.test_files    = `git ls-files -z -- {fixtures,features}/*`.split("\0")
   s.require_paths = ["lib"]
 
   s.add_dependency("middleman-core", Middleman::VERSION)