diff --git a/sources b/sources
index d613d58..73a07f1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (vagrant-2.2.4.tar.gz) = 9d1e9dd42a009d4df159ae3887f43a2664714077a91013a8b63dad72d25d4a236e1dba6daf66443101904f89a5cd37baff65be2714124f7b9f822f26669bcc5a
+SHA512 (vagrant-2.2.5.tar.gz) = dc95e566588987b9199e66ee5f548be573bd62e229d2e4de5447f43f25a1a7129377935ec6dc73cc1f53acc29c08b0a4fabebf1a58310f175cc6d37b856c9272
 SHA512 (vagrant-spec-abfc34474d122235d56e4c6b6fb5d3e35bedfa90.tar.gz) = cbb60d661d34b37bc5d414da0b2a31f39e2910c11251e334da5efbd8f010b5bd428bc1ae476fcb9b42ec4e8f8c6265292ba3f8f543625178ecb85aad06e8856f
diff --git a/vagrant-2.2.5-do-not-load-dependencies.patch b/vagrant-2.2.5-do-not-load-dependencies.patch
new file mode 100644
index 0000000..ea61dfd
--- /dev/null
+++ b/vagrant-2.2.5-do-not-load-dependencies.patch
@@ -0,0 +1,27 @@
+From 38a48ea0dd01532b3ad17e9ed10c15598bc6ce32 Mon Sep 17 00:00:00 2001
+From: Pavel Valena <pvalena@redhat.com>
+Date: Mon, 1 Jul 2019 17:44:54 +0200
+Subject: [PATCH] Do not list / load dependencies if `vagrant` spec is not
+ loaded
+
+in `vagrant_internal_specs` as this fails, due to `find` returning `nil`.
+---
+ lib/vagrant/bundler.rb | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/lib/vagrant/bundler.rb b/lib/vagrant/bundler.rb
+index 7ba48435fa..c0fabdcead 100644
+--- a/lib/vagrant/bundler.rb
++++ b/lib/vagrant/bundler.rb
+@@ -421,8 +421,9 @@ def generate_vagrant_set
+     def vagrant_internal_specs
+       # activate any dependencies up front so we can always
+       # pin them when resolving
+-      Gem::Specification.find { |s| s.name == "vagrant" && s.activated? }.
+-        runtime_dependencies.each { |d| gem d.name, *d.requirement.as_list }
++      if (vs = Gem::Specification.find { |s| s.name == "vagrant" && s.activated? })
++        vs.runtime_dependencies.each { |d| gem d.name, *d.requirement.as_list }
++      end
+       # discover all the gems we have available
+       list = {}
+       directories = [Gem::Specification.default_specifications_dir]
diff --git a/vagrant.spec b/vagrant.spec
index c19d12b..9e093aa 100644
--- a/vagrant.spec
+++ b/vagrant.spec
@@ -3,8 +3,8 @@
 %global vagrant_spec_commit abfc34474d122235d56e4c6b6fb5d3e35bedfa90
 
 Name: vagrant
-Version: 2.2.4
-Release: 3%{?dist}
+Version: 2.2.5
+Release: 1%{?dist}
 Summary: Build and distribute virtualized development environments
 License: MIT
 URL: http://vagrantup.com
@@ -22,6 +22,9 @@ Source4: macros.vagrant
 # Fix fake_ftp 0.3.x compatibility.
 # https://github.com/hashicorp/vagrant/issues/10646
 Patch0: vagrant-2.2.3-Fix-fake_ftp-0.3.x-compatibility.patch
+# Do not load runtime dependencies if vagrant is not loaded
+# https://github.com/hashicorp/vagrant/pull/10945
+Patch1: vagrant-2.2.5-do-not-load-dependencies.patch
 
 # The load directive is supported since RPM 4.12, i.e. F21+. The build process
 # fails on older Fedoras.
@@ -103,6 +106,7 @@ Documentation for %{name}.
 %setup -q -b2
 
 %patch0 -p1
+%patch1 -p1
 
 %build
 # TODO: package vagrant_cloud, as it is not in Fedora yet
@@ -232,6 +236,10 @@ rm -r test/unit/plugins/commands/{cloud,login}/
 # https://github.com/livinginthepast/fake_ftp/pull/56
 sed -i '/^\s*it "adds from FTP URL" do$/ a skip' test/unit/vagrant/action/builtin/box_add_test.rb
 
+# Disable test that requires network
+sed -i '/^    it "generates a network name and configuration" do$/,/^    end/ s/^/#/' \
+  test/unit/plugins/providers/docker/action/prepare_networks_test.rb
+
 # Rake solves the requires issues for tests
 rake -f tasks/test.rake test:unit
 
@@ -345,6 +353,9 @@ end
 
 
 %changelog
+* Wed Aug 14 2019 Pavel Valena <pvalena@redhat.com> - 2.2.5-1
+- Update to Vagrant 2.2.5.
+
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild