diff --git a/sysutils/rubygem-bolt/Makefile b/sysutils/rubygem-bolt/Makefile
index 9bcc015e83ba..85ad335c9673 100644
--- a/sysutils/rubygem-bolt/Makefile
+++ b/sysutils/rubygem-bolt/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	bolt
-PORTVERSION=	3.29.0
+PORTVERSION=	3.30.0
 CATEGORIES=	sysutils rubygems
 MASTER_SITES=	RG
 
@@ -14,12 +14,13 @@ RUN_DEPENDS=	r10k:sysutils/rubygem-r10k \
 		rubygem-aws-sdk-ec2>1:devel/rubygem-aws-sdk-ec2 \
 		rubygem-CFPropertyList>=2.2:devel/rubygem-CFPropertyList \
 		rubygem-concurrent-ruby11>=1.0:devel/rubygem-concurrent-ruby11 \
-		rubygem-ffi>=1.13:devel/rubygem-ffi \
+		rubygem-ffi>=1.13<2:devel/rubygem-ffi \
 		rubygem-hiera-eyaml>=3:sysutils/rubygem-hiera-eyaml \
 		rubygem-jwt>=2.2:www/rubygem-jwt \
 		rubygem-logging>=2.2:devel/rubygem-logging \
-		rubygem-net-scp1>=1.2<2:security/rubygem-net-scp1 \
-		rubygem-net-ssh>=4.0:security/rubygem-net-ssh \
+		rubygem-minitar>=0.6:archivers/rubygem-minitar \
+		rubygem-net-scp>=1.2<5:security/rubygem-net-scp \
+		rubygem-net-ssh6>=4.0<8:security/rubygem-net-ssh6 \
 		rubygem-net-ssh-krb>=0.5:security/rubygem-net-ssh-krb \
 		rubygem-orchestrator_client>=0.5:net/rubygem-orchestrator_client \
 		rubygem-puppet-resource_api>=1.8.1:devel/rubygem-puppet-resource_api \
diff --git a/sysutils/rubygem-bolt/distinfo b/sysutils/rubygem-bolt/distinfo
index 9297a712f5c5..7c6ff662d4cc 100644
--- a/sysutils/rubygem-bolt/distinfo
+++ b/sysutils/rubygem-bolt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1713554398
-SHA256 (rubygem/bolt-3.29.0.gem) = 8fdcbb082fe272b8af6f9055a65bd12ff6c0dbaee39db8c88631b20deed6af7a
-SIZE (rubygem/bolt-3.29.0.gem) = 250880
+TIMESTAMP = 1718594810
+SHA256 (rubygem/bolt-3.30.0.gem) = 082f139f4eebf898377cce635ca537c02cf86a571faee85f1865b5e06b253a4f
+SIZE (rubygem/bolt-3.30.0.gem) = 251392
diff --git a/sysutils/rubygem-bolt/files/patch-bolt.gemspec b/sysutils/rubygem-bolt/files/patch-bolt.gemspec
index f5905d590527..0a24865fabb0 100644
--- a/sysutils/rubygem-bolt/files/patch-bolt.gemspec
+++ b/sysutils/rubygem-bolt/files/patch-bolt.gemspec
@@ -1,10 +1,12 @@
---- bolt.gemspec.orig	2024-03-03 09:09:12 UTC
+--- bolt.gemspec.orig	2024-06-12 01:06:18 UTC
 +++ bolt.gemspec
-@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
+@@ -39,8 +39,8 @@ Gem::Specification.new do |s|
+   s.add_runtime_dependency(%q<puppetfile-resolver>.freeze, [">= 0.6.2".freeze, "< 1.0".freeze])
    s.add_runtime_dependency(%q<puppet-resource_api>.freeze, [">= 1.8.1".freeze])
    s.add_runtime_dependency(%q<puppet-strings>.freeze, [">= 2.3.0".freeze, "< 5.0".freeze])
-   s.add_runtime_dependency(%q<r10k>.freeze, ["~> 3.10".freeze])
+-  s.add_runtime_dependency(%q<r10k>.freeze, ["~> 3.10".freeze])
 -  s.add_runtime_dependency(%q<ruby_smb>.freeze, ["~> 1.0".freeze])
++  s.add_runtime_dependency(%q<r10k>.freeze, [">= 3.10".freeze, "< 5.0".freeze])
 +  s.add_runtime_dependency(%q<ruby_smb>.freeze, [">= 1.0".freeze, "< 4.0".freeze])
    s.add_runtime_dependency(%q<terminal-table>.freeze, ["~> 3.0".freeze])
    s.add_runtime_dependency(%q<winrm>.freeze, ["~> 2.0".freeze])