diff --git a/sysutils/vagrant/Makefile b/sysutils/vagrant/Makefile
index bbd4d80e264f..2588a87151d8 100644
--- a/sysutils/vagrant/Makefile
+++ b/sysutils/vagrant/Makefile
@@ -1,99 +1,102 @@
 PORTNAME=	vagrant
 PORTVERSION=	2.2.19
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils rubygems devel
 
 MAINTAINER=	joe@thrallingpenguin.com
 COMMENT=	Vagrant Virtual Machine Manager
 WWW=		https://www.vagrantup.com/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	rubygem-builder>=2.1.2:devel/rubygem-builder \
 		rubygem-bundler>=1.12.5:sysutils/rubygem-bundler \
 		rubygem-main>=1.0:devel/rubygem-main
 RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss \
 		curl:ftp/curl \
 		rubygem-bcrypt_pbkdf>=1.1:security/rubygem-bcrypt_pbkdf \
 		rubygem-bundler>=1.12.5:sysutils/rubygem-bundler \
 		rubygem-childprocess>=4.1.0:devel/rubygem-childprocess \
 		rubygem-ed2551912>=1.2.4<1.3:security/rubygem-ed2551912 \
 		rubygem-erubis>=2.7.0<2.8:www/rubygem-erubis \
 		rubygem-excon>=0.73<1.0:devel/rubygem-excon \
 		rubygem-hashicorp-checkpoint>=0.1.5<0.2:www/rubygem-hashicorp-checkpoint \
 		rubygem-i18n>=1.8,2<2,2:devel/rubygem-i18n \
 		rubygem-listen>=3.6:devel/rubygem-listen \
 		rubygem-log4r>=1.1.9<1.1.11:sysutils/rubygem-log4r \
 		rubygem-net-scp>=3.0.0:security/rubygem-net-scp \
 		rubygem-net-sftp>=3.0:security/rubygem-net-sftp \
 		rubygem-net-ssh6>=6.1.0<6.2:security/rubygem-net-ssh6 \
 		rubygem-rb-kqueue>=0.2.0<0.3:devel/rubygem-rb-kqueue \
 		rubygem-rest-client>=1.6.0<3.0:www/rubygem-rest-client \
 		rubygem-rexml>=3.2:textproc/rubygem-rexml \
 		rubygem-ruby_dep>=0:devel/rubygem-ruby_dep \
 		rubygem-rubyzip>=2.2<3:archivers/rubygem-rubyzip \
 		rubygem-vagrant_cloud>=3.0.2<3.1:sysutils/rubygem-vagrant_cloud \
 		rubygem-wdm>=0.1.0<0.2:devel/rubygem-wdm \
 		rubygem-winrm-elevated>=1.2.1<2:sysutils/rubygem-winrm-elevated \
 		rubygem-winrm-fs>=1.3.4<2:sysutils/rubygem-winrm-fs \
 		rubygem-winrm>=2.3.4<3:sysutils/rubygem-winrm
 
 USES=		cpe shebangfix
 CPE_VENDOR=	hashicorp
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp
 USE_RUBY=	yes
 
 SHEBANG_FILES=	plugins/hosts/darwin/scripts/install_virtualbox.sh \
 		scripts/sign.sh scripts/website_push_www.sh
 GEMFILES=	vagrant-${PORTVERSION}.gem
 RUBYGEMBIN=	gem
 
 NO_ARCH=	yes
 
 PLIST_SUB+=	DOC_DIR="lib/ruby/gems/${RUBY_VER}/doc" \
 		GEM_BASE_DIR="lib/ruby/gems/${RUBY_VER}/gems" \
 		GEMS_DIR="lib/ruby/gems/${RUBY_VER}" \
 		PORTVERSION="${PORTVERSION}"
 
 RUBYGEM_ARGS=	-l --no-document --no-update-sources --install-dir \
 		${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER} \
 		--ignore-dependencies --bindir=${STAGEDIR}${PREFIX}/bin
 GEM_ENV+=	RB_USER_INSTALL=yes
 
 OPTIONS_DEFINE=		BASH ZSH
 OPTIONS_DEFAULT=	BASH ZSH
 
 BASH_PLIST_FILES=	share/bash-completion/completions/vagrant
 ZSH_PLIST_FILES=	share/share/zsh/site-functions/_vagrant
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|g' ${WRKSRC}/bin/vagrant
+	@${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|g' \
+		${WRKSRC}/bin/vagrant \
+		${WRKSRC}/plugins/providers/virtualbox/action/network.rb \
+		${WRKSRC}/templates/locales/en.yml
 
 do-build:
 	(cd ${WRKSRC}; (${ECHO_CMD} -e "install:\n\techo\n") > Makefile)
 	(cd ${WRKSRC}; ${SETENV} VAGRANT_INSTALLER_ENV=yes \
 		${GEM_ENV} ${RUBYGEMBIN} build vagrant.gemspec)
 	(cd ${WRKSRC}; ${SETENV} VAGRANT_INSTALLER_ENV=yes \
 		${GEM_ENV} ${RUBYGEMBIN} install ${RUBYGEM_ARGS} \
 		${GEMFILES} -- ${CONFIGURE_ARGS})
 	${RMDIR} ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/build_info
 	${MKDIR} ${STAGEDIR}${DATADIR}/embedded/rgloader
 	${INSTALL_SCRIPT} ${FILESDIR}/loader.rb \
 		${STAGEDIR}${DATADIR}/embedded/rgloader/loader.rb
 
 post-install:
 	${RMDIR} ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/doc
 	${RM} ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/gems/${PORTNAME}-${PORTVERSION}/.runner.sh
 
 post-install-BASH-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions
 	${RLN} ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/gems/${PORTNAME}-${PORTVERSION}/contrib/bash/completion.sh ${STAGEDIR}${PREFIX}/share/bash-completion/completions/vagrant
 
 post-install-ZSH-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/share/zsh/site-functions
 	${RLN} ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/gems/${PORTNAME}-${PORTVERSION}/contrib/zsh/_vagrant ${STAGEDIR}${PREFIX}/share/share/zsh/site-functions
 
 .include <bsd.port.mk>
diff --git a/sysutils/vagrant/files/patch-plugins_providers_virtualbox_action_network.rb b/sysutils/vagrant/files/patch-plugins_providers_virtualbox_action_network.rb
new file mode 100644
index 000000000000..b56e62d6909c
--- /dev/null
+++ b/sysutils/vagrant/files/patch-plugins_providers_virtualbox_action_network.rb
@@ -0,0 +1,11 @@
+--- plugins/providers/virtualbox/action/network.rb.orig	2021-11-05 21:15:44 UTC
++++ plugins/providers/virtualbox/action/network.rb
+@@ -18,7 +18,7 @@ module VagrantPlugins
+       class Network
+ 
+         # Location of the VirtualBox networks configuration file
+-        VBOX_NET_CONF = "/etc/vbox/networks.conf".freeze
++        VBOX_NET_CONF = "@PREFIX@/etc/vbox/networks.conf".freeze
+         # Version of VirtualBox that introduced hostonly network range restrictions
+         HOSTONLY_VALIDATE_VERSION = Gem::Version.new("6.1.28")
+         # Default valid range for hostonly networks
diff --git a/sysutils/vagrant/files/patch-templates_locales_en.yml b/sysutils/vagrant/files/patch-templates_locales_en.yml
new file mode 100644
index 000000000000..01d2cceffd37
--- /dev/null
+++ b/sysutils/vagrant/files/patch-templates_locales_en.yml
@@ -0,0 +1,11 @@
+--- templates/locales/en.yml.orig	2021-11-05 21:15:44 UTC
++++ templates/locales/en.yml
+@@ -1863,7 +1863,7 @@ en:
+           Address: %{address}
+           Ranges: %{ranges}
+ 
+-        Valid ranges can be modified in the /etc/vbox/networks.conf file. For
++        Valid ranges can be modified in the @PREFIX@/etc/vbox/networks.conf file. For
+         more information including valid format see:
+ 
+           https://www.virtualbox.org/manual/ch06.html#network_hostonly