diff --git a/lib/vagrant/bundler.rb b/lib/vagrant/bundler.rb                                                               

index 05867da..ea8c056 100644

--- a/lib/vagrant/bundler.rb

+++ b/lib/vagrant/bundler.rb

@@ -188,7 +188,7 @@ module Vagrant

           gemfile.puts(%Q[source "#{source}"])

         end

-        gemfile.puts(%Q[gem "vagrant", "= #{VERSION}"])

+        gemfile.puts(%Q[gemspec :path => "#{File.expand_path '../../..', __FILE__}"])

         gemfile.puts("group :plugins do")

         plugins.each do |name, plugin|

diff --git a/lib/vagrant/util/downloader.rb b/lib/vagrant/util/downloader.rb

index 8756fc3..7fb2be8 100644

--- a/lib/vagrant/util/downloader.rb

+++ b/lib/vagrant/util/downloader.rb

@@ -215,8 +215,9 @@ module Vagrant

         # If we're in Vagrant, then we use the packaged CA bundle

         if Vagrant.in_installer?

           subprocess_options[:env] ||= {}

-          subprocess_options[:env]["CURL_CA_BUNDLE"] =

-            File.expand_path("cacert.pem", ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"])

+          # Use system certificates.

+          # subprocess_options[:env]["CURL_CA_BUNDLE"] =

+          #   File.expand_path("cacert.pem", ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"])

         end

         return [options, subprocess_options]

diff --git a/vagrant.gemspec b/vagrant.gemspec

index d2b9398..6158fb2 100644

--- a/vagrant.gemspec

+++ b/vagrant.gemspec

@@ -18,25 +18,30 @@ Gem::Specification.new do |s|

-  s.add_dependency "bundler", ">= 1.5.2", "< 1.8.0"

+  s.add_dependency "bundler", ">= 1.5.2", "!= 1.7.0"

   s.add_dependency "childprocess", "~> 0.5.0"

   s.add_dependency "erubis", "~> 2.7.0"

-  s.add_dependency "i18n", "~> 0.6.0"

+  s.add_dependency "i18n", ">= 0.6.0"

+  # https://github.com/mitchellh/vagrant/pull/4770

+  s.add_dependency "json"

   s.add_dependency "listen", "~> 2.8.0"

   s.add_dependency "hashicorp-checkpoint", "~> 0.1.1"

   s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"

   s.add_dependency "net-ssh", ">= 2.6.6", "< 2.10.0"

   s.add_dependency "net-sftp", "~> 2.1"

-  s.add_dependency "net-scp", "~> 1.1.0"

-  s.add_dependency "rb-kqueue", "~> 0.2.0"

+  s.add_dependency "net-scp", ">= 1.1.0"

   s.add_dependency "rest-client", ">= 1.6.0", "< 2.0"

-  s.add_dependency "wdm", "~> 0.1.0"

-  s.add_dependency "winrm", "~> 1.1.3"

+  #s.add_dependency "rb-kqueue", "~> 0.2.0"

+  #s.add_dependency "wdm", "~> 0.1.0"

+  #s.add_dependency "winrm", "~> 1.1.3"

   # We lock this down to avoid compilation issues.

-  s.add_dependency "nokogiri", "= 1.6.3.1"

+  s.add_dependency "nokogiri"

-  s.add_development_dependency "rake"

-  s.add_development_dependency "rspec", "~> 2.14.0"

-  s.add_development_dependency "webmock", "~> 1.20"

-  s.add_development_dependency "fake_ftp", "~> 0.1"

+  # This dependency is typically provided by listen, but was removed in Fedora.

+  s.add_dependency "rb-inotify"

+  

+  #s.add_development_dependency "rake"

+  #s.add_development_dependency "rspec", "~> 2.14.0"

+  #s.add_development_dependency "webmock", "~> 1.20"

+  #s.add_development_dependency "fake_ftp", "~> 0.1"

   # The following block of code determines the files that should be included

   # in the gem. It does this by reading all the files in the directory where

@@ -47,10 +52,10 @@ Gem::Specification.new do |s|

   all_files      = Dir.chdir(root_path) { Dir.glob("**/{*,.*}") }

   all_files.reject! { |file| [".", ".."].include?(File.basename(file)) }

   all_files.reject! { |file| file.start_with?("website/") }

-  gitignore_path = File.join(root_path, ".gitignore")

-  gitignore      = File.readlines(gitignore_path)

-  gitignore.map!    { |line| line.chomp.strip }

-  gitignore.reject! { |line| line.empty? || line =~ /^(#|!)/ }

+  #gitignore_path = File.join(root_path, ".gitignore")

+  #gitignore      = File.readlines(gitignore_path)

+  #gitignore.map!    { |line| line.chomp.strip }

+  #gitignore.reject! { |line| line.empty? || line =~ /^(#|!)/ }

   unignored_files = all_files.reject do |file|

     # Ignore any directories, the gemspec only cares about files

@@ -64,10 +69,10 @@ Gem::Specification.new do |s|

     #     like '.DS_Store' will match sub-directories too (same behavior

     #     as git).

     #

-    gitignore.any? do |ignore|

-      File.fnmatch(ignore, file, File::FNM_PATHNAME) ||

-        File.fnmatch(ignore, File.basename(file), File::FNM_PATHNAME)

-    end

+    #gitignore.any? do |ignore|

+    #  File.fnmatch(ignore, file, File::FNM_PATHNAME) ||

+    #    File.fnmatch(ignore, File.basename(file), File::FNM_PATHNAME)

+    #end

   end

   s.files         = unignored_files

-- 

2.1.0