diff --git a/teamocil.gemspec b/teamocil.gemspec
index f6b53d3..70f1188 100644
--- a/teamocil.gemspec
+++ b/teamocil.gemspec
@@ -3,6 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 require "teamocil"
 
 spec = Gem::Specification.new do |s|
+  # Metadata
   s.name         = "teamocil"
   s.version      = Teamocil::VERSION
   s.platform     = Gem::Platform::RUBY
@@ -11,13 +12,17 @@ spec = Gem::Specification.new do |s|
   s.homepage     = "http://github.com/remiprev/teamocil"
   s.summary      = "Easy window and split layouts for tmux"
   s.description  = "Teamocil helps you set up window and splits layouts for tmux using YAML configuration files."
-  s.files        = Dir["lib/**/*.rb", "README.md", "LICENSE", "bin/*", "spec/**/*.rb"]
-  s.require_path = "lib"
-  s.executables << "teamocil"
 
-  s.add_development_dependency("rake")
-  s.add_development_dependency("rspec")
-  s.add_development_dependency("yard")
-  s.add_development_dependency("maruku")
+  # Manifest
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  # Dependencies
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "yard"
+  s.add_development_dependency "maruku"
 
 end