diff --git a/Rakefile b/Rakefile
index 13e97e8a..d5dd3551 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,9 +1,4 @@
-begin
-  require 'bundler/gem_tasks'
-rescue LoadError
-  puts 'Cannot load bundler/gem_tasks'
-end
-
+require 'bundler/gem_tasks'
 require 'tasks/libsass'
 
 task default: :test
diff --git a/sassc.gemspec b/sassc.gemspec
index 71cd416d..d46ef312 100644
--- a/sassc.gemspec
+++ b/sassc.gemspec
@@ -13,21 +13,20 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/sass/sassc-ruby"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0")
+  spec.files         = Dir.glob('lib/**/*') + %w(README.md LICENSE.txt ext/Rakefile)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 
   spec.require_paths = ["lib"]
 
   spec.extensions    = ["ext/Rakefile"]
 
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest", "~> 5.5.1"
   spec.add_development_dependency "minitest-around"
   spec.add_development_dependency "test_construct"
   spec.add_development_dependency "pry"
 
-  spec.add_dependency "bundler"
   spec.add_dependency "ffi", "~> 1.9.6"
   spec.add_dependency "sass", ">= 3.3.0"
 
@@ -43,4 +42,3 @@ Gem::Specification.new do |spec|
     end
   end
 end
-