diff --git a/rest-client.gemspec b/rest-client.gemspec
index e9a6acc..caef670 100644
--- a/rest-client.gemspec
+++ b/rest-client.gemspec
@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
   s.email = 'rest.client@librelist.com'
   s.executables = ['restclient']
   s.extra_rdoc_files = ["README.rdoc", "history.md"]
-  s.files = `git ls-files`.split("\n")
-  s.test_files = `git ls-files -- spec/*`.split("\n")
+  s.files = `git ls-files -z`.split("\0")
+  s.test_files = `git ls-files -z spec/`.split("\0")
   s.homepage = 'http://github.com/rest-client/rest-client'
   s.summary = 'Simple HTTP and REST client for Ruby, inspired by microframework syntax for specifying actions.'