diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 62ff721af6d4..b7853b513245 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -88,7 +88,7 @@ PYTHON2_DEFAULT?=	2.7
 # Possible values: 3.5, 3.6, 3.7
 PYTHON3_DEFAULT?=	3.6
 # Possible values: 2.4, 2.5
-RUBY_DEFAULT?=		2.4
+RUBY_DEFAULT?=		2.5
 # Possible values: rust, rust-nightly
 RUST_DEFAULT?=		rust
 # Possible values: 4.6, 4.7, 4.8
diff --git a/UPDATING b/UPDATING
index 46f08bdb93cf..53d3bb9c575b 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,40 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20190420:
+  AFFECTS: users of lang/ruby24
+  AUTHOR: mfechner@FreeBSD.org
+
+  The default ruby version has been updated from 2.4 to 2.5.
+
+  If you compile your own ports you may keep 2.4 as the default version by
+  adding the following lines to your /etc/make.conf file:
+
+  #
+  # Keep ruby 2.4 as default version
+  #
+  DEFAULT_VERSIONS+=ruby=2.4
+
+  If you wish to update to the new default version, you need to first stop any
+  software that uses ruby. Then, you will need to follow these steps, depending
+  upon how you manage your system.
+
+  If you use pkgng, simply upgrade:
+  # pkg upgrade
+
+  If you use portmaster, install new ruby, then rebuild all ports that depend
+  on ruby:
+  # portmaster -o lang/ruby25 lang/ruby24
+  # portmaster -R -r ruby-2.5
+
+  If you use portupgrade, install new ruby, then rebuild all ports that depend
+  on ruby:
+
+  # pkg delete -f ruby portupgrade
+  # make -C /usr/ports/ports-mgmt/portupgrade install clean
+  # pkg set -o lang/ruby24:lang/ruby25
+  # portupgrade -x ruby-2.5.\* -fr lang/ruby25
+
 20190419
   AFFECTS: users of emulators/qemu
   AUTHOR: bofh@FreeBSD.org