diff --git a/spec/bundler/support/path.rb b/spec/bundler/support/path.rb
index 38f7145dc7..69efcba051 100644
--- a/spec/bundler/support/path.rb
+++ b/spec/bundler/support/path.rb
@@ -9,7 +9,7 @@ module Spec
     end
 
     def gemspec
-      @gemspec ||= root.join(ruby_core? ? "lib/bundler.gemspec" : "bundler.gemspec")
+      @gemspec ||= root.join(ruby_core? ? "lib/bundler/bundler.gemspec" : "bundler.gemspec")
     end
 
     def bindir
diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb
index bb4fcdd2cc..26458147e5 100644
--- a/tool/sync_default_gems.rb
+++ b/tool/sync_default_gems.rb
@@ -89,7 +89,7 @@ def sync_default_gems(gem)
     `rm -rf lib/bundler* libexec/bundler libexec/bundle libexec/bundle_ruby spec/bundler man/bundle* man/gemfile*`
     `cp -r ../../bundler/bundler/lib/bundler* ./lib`
     `cp -r ../../bundler/bundler/exe/bundle* ./libexec`
-    `cp ../../bundler/bundler/bundler.gemspec ./lib`
+    `cp ../../bundler/bundler/bundler.gemspec ./lib/bundler`
     `cp -r ../../bundler/bundler/spec spec/bundler`
     `cp -r ../../bundler/bundler/man/*.{1,5,1\.txt,5\.txt,ronn} ./man`
     `rm -rf spec/bundler/support/artifice/vcr_cassettes`