diff --git a/common/shlibs b/common/shlibs
index ef93e614c251e4..bdecda4ada994b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -462,7 +462,7 @@ libSDL_ttf-2.0.so.0 SDL_ttf-2.0.9_1
 libparted.so.2 libparted-3.1_1
 libparted-fs-resize.so.0 libparted-3.1_1
 libntfs-3g.so.89 ntfs-3g-2021.8.22_1
-libruby.so.3.4 ruby-3.4.5_1
+libruby.so.4.0 ruby-4.0.1_1
 libada.so.3 ada-3.1.0_1
 librw.so.0 rankwidth-0.9_1
 libxenctrl.so.4.19 xen-libs-4.19.0_1
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index ac43385a1310c1..8c318ff6842631 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
 version=1.3.24
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy
diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index cde851da2a7e83..caa90890afaf4c 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,7 +1,7 @@
 # Template file for 'libguestfs'
 pkgname=libguestfs
 version=1.56.2
-revision=2
+revision=3
 _version_short=${version%.*}
 build_style=gnu-configure
 make_install_args="INSTALLDIRS=vendor"
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index cadf847e848dd9..7cf8d5e7448e1e 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,7 +1,7 @@
 # Template file for 'notmuch'
 pkgname=notmuch
 version=0.39
-revision=4
+revision=5
 build_style=configure
 build_helper=python3
 configure_args="--prefix=/usr
diff --git a/srcpkgs/rrdtool/template b/srcpkgs/rrdtool/template
index 2cbddbc912795b..a712e243c3da09 100644
--- a/srcpkgs/rrdtool/template
+++ b/srcpkgs/rrdtool/template
@@ -1,7 +1,7 @@
 # Template file for 'rrdtool'
 pkgname=rrdtool
 version=1.8.0
-revision=9
+revision=10
 build_style=gnu-configure
 configure_args="--enable-perl --enable-perl-site-install
  --with-perl-options=INSTALLDIRS=vendor --enable-ruby
diff --git a/srcpkgs/ruby-clocale/template b/srcpkgs/ruby-clocale/template
index 3688af92b0c827..af0b8f57b5e0e1 100644
--- a/srcpkgs/ruby-clocale/template
+++ b/srcpkgs/ruby-clocale/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-clocale'
 pkgname=ruby-clocale
 version=0.0.4
-revision=8
+revision=9
 build_style=gemspec
 short_desc="Ruby gem that wraps C locale functions"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/ruby-ffi/template b/srcpkgs/ruby-ffi/template
index 2772e0b28da852..8a3c5dc006471e 100644
--- a/srcpkgs/ruby-ffi/template
+++ b/srcpkgs/ruby-ffi/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-ffi'
 pkgname=ruby-ffi
 version=1.11.3
-revision=9
+revision=10
 build_style=gemspec
 hostmakedepends="libffi-devel"
 makedepends="libffi-devel"
diff --git a/srcpkgs/ruby-hpricot/template b/srcpkgs/ruby-hpricot/template
index 27f69da0535887..6a46517729fe8c 100644
--- a/srcpkgs/ruby-hpricot/template
+++ b/srcpkgs/ruby-hpricot/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-hpricot'
 pkgname=ruby-hpricot
 version=0.8.6
-revision=10
+revision=11
 build_style=gemspec
 makedepends="ruby-devel"
 short_desc="Swift, liberal HTML parser"
diff --git a/srcpkgs/ruby-rdiscount/template b/srcpkgs/ruby-rdiscount/template
index 4323234e8b22d7..dfcf9f6e5889e2 100644
--- a/srcpkgs/ruby-rdiscount/template
+++ b/srcpkgs/ruby-rdiscount/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-rdiscount'
 pkgname=ruby-rdiscount
 version=2.2.7.3
-revision=1
+revision=2
 build_style=gemspec
 makedepends="ruby-devel"
 short_desc="Fast implementation of Gruber's Markdown in C"
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index bef721b28fe144..98acdfc2a2ce16 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -1,8 +1,8 @@
 # Template file for 'ruby'
-_ruby_abiver=3.4.0
+_ruby_abiver=4.0.0
 
 pkgname=ruby
-version=3.4.8
+version=4.0.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath --enable-pie
@@ -16,7 +16,7 @@ homepage="https://www.ruby-lang.org/en/"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Ruby, BSD-2-Clause"
 distfiles="https://cache.ruby-lang.org/pub/ruby/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=53a8ec71111449cbbd42224d8d27c493fa6ded228636731051c48604d4255d68
+checksum=0531fe57dfdb56bf591620d2450642ea0e0964f3512a6ebee7dc9305de69395f
 
 if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
 	makedepends+=" libxcrypt-devel"
@@ -113,6 +113,9 @@ ruby-ri_package() {
 		if [ -d "${DESTDIR}/usr/share/ri" ]; then
 			vmove usr/share/ri
 		fi
-		vmove "usr/share/man/man1/ri*"
-	}
+		# Ruby 4.x may not install ri manpages on some builds; do not fail if absent
+		set -- "${DESTDIR}/usr/share/man/man1/ri"*
+		if [ -e "$1" ]; then
+			vmove "usr/share/man/man1/ri*"
+		fi	}
 }
diff --git a/srcpkgs/subtle/template b/srcpkgs/subtle/template
index d52fd51ca1f057..92624c1b494df6 100644
--- a/srcpkgs/subtle/template
+++ b/srcpkgs/subtle/template
@@ -1,7 +1,7 @@
 # Template file for 'subtle'
 pkgname=subtle
 version=0.11.6610
-revision=1
+revision=2
 hostmakedepends="python3 mercurial ruby-devel pkg-config"
 makedepends="ruby-devel libX11-devel libXpm-devel libXft-devel
  libXinerama-devel libXrandr-devel libXtst-devel"
diff --git a/srcpkgs/vagrant/template b/srcpkgs/vagrant/template
index bbf2c9efb1ca50..3824914ed7d577 100644
--- a/srcpkgs/vagrant/template
+++ b/srcpkgs/vagrant/template
@@ -1,7 +1,7 @@
 # Template file for 'vagrant'
 pkgname=vagrant
 version=2.4.9
-revision=1
+revision=2
 archs="i686 x86_64*"
 build_style=gemspec
 depends="bsdtar curl openssh rsync"
diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index 9ba57c37556d8b..edfc88925106b8 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -1,7 +1,7 @@
 # Template file for 'vim'
 pkgname=vim
 version=9.1.2011
-revision=2
+revision=3
 create_wrksrc=required
 hostmakedepends="gettext glib-devel pkg-config
  $(vopt_if gtk3 wayland-devel)"
diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template
index bf8780ebbeffc6..f3a6fb5a977119 100644
--- a/srcpkgs/weechat/template
+++ b/srcpkgs/weechat/template
@@ -1,7 +1,7 @@
 # Template file for 'weechat'
 pkgname=weechat
 version=4.8.1
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DENABLE_MAN=ON -DENABLE_PERL=ON
  -DENABLE_LUA=ON -DENABLE_RUBY=ON -DENABLE_SPELL=ON