diff --git a/binary_struct.gemspec b/binary_struct.gemspec
index 6443663..02c846b 100644
--- a/binary_struct.gemspec
+++ b/binary_struct.gemspec
@@ -18,9 +18,11 @@ from/to a Hash.
   spec.homepage      = "http://github.com/ManageIQ/binary_struct"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files         = `git ls-files -- lib/*`.split("\n")
+  spec.files        += %w[README.md LICENSE.txt]
+  spec.executables   = `git ls-files -- bin/*`.split("\n")
+  spec.test_files    = `git ls-files -- spec/*`.split("\n")
+  spec.test_files   += %w[.rspec]
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 4119f02..6652261 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -15,5 +15,8 @@
   config.order = 'random'
 end
 
-require 'coveralls'
-Coveralls.wear!
+begin
+  require 'coveralls'
+  Coveralls.wear!
+rescue LoadError
+end