diff --git a/Rakefile b/Rakefile
index 14cfe0b..f2bc512 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,2 +1,11 @@
-require 'bundler'
+require "bundler"
 Bundler::GemHelper.install_tasks
+
+task :default => :spec
+
+desc "Run all awesome_print gem specs"
+task :spec do
+  # Run plain rspec command without RSpec::Core::RakeTask overrides.
+  exec "rspec -c spec"
+end
+
diff --git a/awesome_print.gemspec b/awesome_print.gemspec
index bbc7a58..d05e4d2 100644
--- a/awesome_print.gemspec
+++ b/awesome_print.gemspec
@@ -6,14 +6,6 @@
 require "rake"
 require File.dirname(__FILE__) + "/lib/awesome_print/version"
 
-task :default => :spec
-
-desc "Run all awesome_print gem specs"
-task :spec do
-  # Run plain rspec command without RSpec::Core::RakeTask overrides.
-  exec "rspec -c spec"
-end
-
 Gem::Specification.new do |s|
   s.name        = "awesome_print"
   s.version     = AwesomePrint.version
@@ -27,8 +19,8 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "awesome_print"
 
-  s.files         = Rake::FileList["[A-Z]*", "lib/**/*.rb", "spec/*", ".gitignore"]
-  s.test_files    = Rake::FileList["spec/*"]
+  s.files         = Dir["[A-Z]*[^~]"] + Dir["lib/**/*.rb"] + Dir["spec/*"] + [".gitignore"]
+  s.test_files    = Dir["spec/*"]
   s.executables   = []
   s.require_paths = ["lib"]