diff --git a/Rakefile b/Rakefile
index 34ce6386e..b2f594b00 100644
--- a/Rakefile
+++ b/Rakefile
@@ -7,8 +7,7 @@ require "rake/extensiontask"
 $stdout.sync = true
 $stderr.sync = true
 
-Rake::ExtensionTask.new "vagrant_ssl" do |ext|
-  ext.lib_dir = "lib/vagrant"
+Rake::ExtensionTask.new "vagrant/vagrant_ssl" do |ext|
 end
 
 # Load all the rake tasks from the "tasks" folder. This folder
diff --git a/ext/vagrant_ssl/extconf.rb b/ext/vagrant/vagrant_ssl/extconf.rb
similarity index 100%
rename from ext/vagrant_ssl/extconf.rb
rename to ext/vagrant/vagrant_ssl/extconf.rb
diff --git a/ext/vagrant_ssl/vagrant_ssl.c b/ext/vagrant/vagrant_ssl/vagrant_ssl.c
similarity index 100%
rename from ext/vagrant_ssl/vagrant_ssl.c
rename to ext/vagrant/vagrant_ssl/vagrant_ssl.c
diff --git a/ext/vagrant_ssl/vagrant_ssl.h b/ext/vagrant/vagrant_ssl/vagrant_ssl.h
similarity index 100%
rename from ext/vagrant_ssl/vagrant_ssl.h
rename to ext/vagrant/vagrant_ssl/vagrant_ssl.h
diff --git a/vagrant.gemspec b/vagrant.gemspec
index 2a740089a..56781e88f 100644
--- a/vagrant.gemspec
+++ b/vagrant.gemspec
@@ -105,6 +105,6 @@ Gem::Specification.new do |s|
 
   s.files         = unignored_files
   s.executables   = unignored_files.map { |f| f[/^bin\/(.*)/, 1] }.compact
-  s.extensions    = ["ext/vagrant_ssl/extconf.rb"]
+  s.extensions    = ["ext/vagrant/vagrant_ssl/extconf.rb"]
   s.require_path  = 'lib'
 end