diff --git a/.rubocop.yml b/.rubocop.yml
index 29755a01..682f87cc 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,6 +4,7 @@ AllCops:
 require:
   - rubocop-rspec
   - rubocop-performance
+  - rubocop-packaging
 
 Layout/SpaceInsideHashLiteralBraces:
   EnforcedStyle: no_space
diff --git a/webdrivers.gemspec b/webdrivers.gemspec
index 128189e8..bdb5b9a7 100644
--- a/webdrivers.gemspec
+++ b/webdrivers.gemspec
@@ -3,6 +3,7 @@
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
 require 'webdrivers/version'
+require 'rake/file_list'
 
 Gem::Specification.new do |s|
   s.name        = 'webdrivers'
@@ -22,8 +23,9 @@ Gem::Specification.new do |s|
     'source_code_uri' => "https://github.com/titusfortner/webdrivers/tree/v#{Webdrivers::VERSION}"
   }
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.files         = Rake::FileList['CHANGELOG.md', 'lib/**/*', 'LICENSE.txt', \
+                                   'README.md'].exclude(*File.read('.gitignore').split)
+  s.test_files    = Dir['spec/**/*'].reject { |f| File.directory?(f) }
   s.executables   = []
   s.require_paths = ['lib']
 
@@ -31,6 +33,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake', '~> 12.0'
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rubocop', '~>0.89'
+  s.add_development_dependency 'rubocop-packaging', '~>0.2.0'
   s.add_development_dependency 'rubocop-performance'
   s.add_development_dependency 'rubocop-rspec', '~>1.42'
   s.add_development_dependency 'simplecov', '~>0.16'