diff --git a/common/shlibs b/common/shlibs
index fec752aa054..f50685a7148 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -455,7 +455,7 @@ libKScreenLocker.so.5 kscreenlocker-5.8.4_1
 libparted.so.2 libparted-3.1_1
 libparted-fs-resize.so.0 libparted-3.1_1
 libntfs-3g.so.88 ntfs-3g-2017.3.23_1
-libruby.so.2.5 ruby-2.5.0_1
+libruby.so.2.6 ruby-2.6.0_1
 libprocessui.so.7 libksysguard-5.8.4_1
 libksignalplotter.so.7 libksysguard-5.8.4_1
 libksgrd.so.7 libksysguard-5.8.4_1
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index c61be8ed6db..d909b466255 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -1,23 +1,23 @@
 # Template file for 'ruby'
-_ruby_abiver=2.5.0
+_ruby_abiver=2.6.0
 
 pkgname=ruby
-version=2.5.3
-revision=2
+version=2.6.0
+revision=1
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
+hostmakedepends="pkg-config bison groff"
+makedepends="zlib-devel readline-devel libffi-devel libressl-devel
+ gdbm-devel libyaml-devel pango-devel"
+checkdepends="tzdata"
 short_desc="Ruby programming language"
 homepage="http://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.bz2"
-checksum=228a787ba68a7b20ac6e1d5af3d176d36e8ed600eb754d6325da341c3088ed76
-
-hostmakedepends="pkg-config bison groff"
-makedepends="zlib-devel readline-devel libffi-devel libressl-devel
- gdbm-devel libyaml-devel pango-devel"
+checksum=c89ca663ad9a6238f4b1ec4d04c7dff630560c6e6eca6d30857c4d394f01a599
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Broken on the builders but successfully built locally
@@ -40,17 +40,16 @@ pre_build() {
 	sed -e 's,\(checking_for("wide getaddrinfo") {try_\)run,\1link,' -i ext/socket/extconf.rb
 	# Hack for cross-builds.
 	touch ext/ripper/check
-	if [ "$XBPS_GCC_VERSION_MAJOR" -ge 7 ]; then
-		# 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
-	fi
+	# 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
@@ -64,6 +63,7 @@ post_install() {
 		${DESTDIR}/usr/lib/ruby/${_ruby_abiver}/*/rbconfig.rb
 	vlicense COPYING
 }
+
 ruby-devel-doc_package() {
 	short_desc+=" - HTML C API documentation files"
 	noarch=yes
@@ -77,6 +77,7 @@ ruby-devel-doc_package() {
 		fi
 	}
 }
+
 ruby-devel_package() {
 	depends="ruby-${version}_${revision} gmp-devel"
 	short_desc+=" - development files"
@@ -86,6 +87,7 @@ ruby-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
+
 ruby-ri_package() {
 	depends="ruby-${version}_${revision}"
 	short_desc="Ruby Interactive reference"