diff --git a/common/shlibs b/common/shlibs
index 02405e11dde..63ac6b9f2c3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -459,7 +459,7 @@ libKScreenLocker.so.6 kscreenlocker-6.0.0_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.3 ruby-3.3.2_1
+libruby.so.3.4 ruby-3.4.5_1
 libada.so.3 ada-3.1.0_1
 librw.so.0 rankwidth-0.9_1
 libKSysGuardFormatter.so.2 libksysguard-6.0.0_1
diff --git a/srcpkgs/ruby/patches/i686-fix-miscompile-gcc14.patch b/srcpkgs/ruby/patches/i686-fix-miscompile-gcc14.patch
new file mode 100644
index 00000000000..020734ec684
--- /dev/null
+++ b/srcpkgs/ruby/patches/i686-fix-miscompile-gcc14.patch
@@ -0,0 +1,12 @@
+--- a/string.c
++++ b/string.c
+@@ -5354,7 +5354,8 @@
+         ENC_CODERANGE_SET(str, ENC_CODERANGE_UNKNOWN);
+     }
+     RESIZE_CAPA(str, slen + carry_len);
+-    sbeg = RSTRING_PTR(str);
++    volatile VALUE wtf = str;
++    sbeg = RSTRING_PTR(wtf);
+     s = sbeg + carry_pos;
+     memmove(s + carry_len, s, slen - carry_pos);
+     memmove(s, carry, carry_len);
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index 8aaaf5d71b4..fa769775c49 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -1,11 +1,11 @@
 # Template file for 'ruby'
-_ruby_abiver=3.3.0
+_ruby_abiver=3.4.0
 
 pkgname=ruby
-version=3.3.8
-revision=2
+version=3.4.5
+revision=1
 build_style=gnu-configure
-configure_args="--enable-shared --disable-rpath
+configure_args="--enable-shared --disable-rpath --enable-pie
  PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
@@ -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=44ae70fee043da3ce48289b7a52618ebe32dc083253993d486211c7e445c8642
+checksum=7b3a905b84b8777aa29f557bada695c3ce108390657e614d2cc9e2fb7e459536
 
 if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
 	makedepends+=" libxcrypt-devel"
@@ -68,17 +68,6 @@ pre_configure() {
 	esac
 }
 
-pre_build() {
-	# Set -fno-stack-protector for i686* or otherwise linking fails with
-	# ...: undefined reference to '__stack_chk_fail_local'
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) sed -i Makefile \
-				-e "s;-fstack-protector-strong;;" \
-				-e "s;-fstack-protector;-fno-stack-protector;"
-			;;
-	esac
-}
-
 post_install() {
 	# Remove references to the cross compiler
 	if [ "$CROSS_BUILD" ]; then
@@ -87,8 +76,6 @@ post_install() {
 	# Replace reference to the install(1) wrapper
 	vsed -e "s,${XBPS_WRAPPERDIR},/usr/bin,g" -i \
 		${DESTDIR}/usr/lib/ruby/${_ruby_abiver}/*/rbconfig.rb
-	# https://bugs.ruby-lang.org/issues/20721 remove with 3.3.6
-	rm -f ${DESTDIR}/usr/bin/*.lock
 	vlicense COPYING
 }