diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec
index 7e8a10f7..e7610319 100644
--- a/middleman-core/middleman-core.gemspec
+++ b/middleman-core/middleman-core.gemspec
@@ -13,8 +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.test_files   = `git ls-files -- {fixtures,features}/*`.split("\n")
+  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"
   
diff --git a/middleman-more/middleman-more.gemspec b/middleman-more/middleman-more.gemspec
index 3eecc23a..84852019 100644
--- a/middleman-more/middleman-more.gemspec
+++ b/middleman-more/middleman-more.gemspec
@@ -13,8 +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.test_files    = `git ls-files -- {fixtures,features}/*`.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)