diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index 09515207b6ee..c693eaab552d 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -69,10 +69,15 @@ Ruby_Include_MAINTAINER=	ruby@FreeBSD.org
 #
 # RUBY_PKGNAMEPREFIX	- Common PKGNAMEPREFIX for ruby ports
 #			  (default: ruby${RUBY_SUFFIX}-)
-# RUBY_VERSION		- Full version of ruby without preview/beta suffix in
+# RUBY_RELVERSION	- Full version of ruby without preview/beta suffix in
 #			  the form of `x.y.z' (see below for current value).
-# RUBY_VERSION_CODE	- Full integer version of ruby without preview/beta
-#			  suffix in the form of `xyz'.
+# RUBY_RELVERSION_CODE	- Integer version of RUBY_RELVERSION in the form of
+#			  `xyz'.
+# RUBY_VERSION		- Composite version of RUBY_RELVERSION and
+#			  RUBY_PATCHLEVEL in the form of `x.y.z.p'.
+#			  (default: ${RUBY_RELVERSION}.${RUBY_PATCHLEVEL})
+# RUBY_VERSION_CODE	- Composite integer version of RUBY_VERSION in the form
+#			  of `xyzp'.
 # RUBY_PORTVERSION	- PORTVERSION for the standard ruby ports (ruby,
 #			  ruby-gdbm, etc.).
 # RUBY_PORTREVISION	- PORTREVISION for the standard ruby ports.
@@ -275,6 +280,7 @@ RUBY_DISTNAME?=		ruby-${RUBY_DISTVERSION}
 
 RUBY_WRKSRC?=		${WRKDIR}/${RUBY_DISTNAME}
 
+RUBY_RELVERSION_CODE?=	${RUBY_RELVERSION:S/.//g}
 RUBY_VERSION_CODE?=	${RUBY_VERSION:S/.//g}
 RUBY_VER=		${RUBY_VERSION:C/([[:digit:]]+\.[[:digit:]]+).*/\1/}
 RUBY_SUFFIX=		${RUBY_VER:S/.//}
@@ -362,7 +368,7 @@ USE_RUBY=		yes
 
 .if exists(${RUBY})
 RUBY_PROVIDED!=		${RUBY} -e '\
-	Ruby = ${RUBY_VERSION_CODE}; \
+	Ruby = ${RUBY_RELVERSION_CODE}; \
 	value = begin; ${RUBY_REQUIRE}; end and puts value'
 .else
 RUBY_PROVIDED=		"should be"	# the latest version is going to be installed