diff --git a/devel/ruby-gems/Makefile b/devel/ruby-gems/Makefile
index 11d27f926763..25778e0c4406 100644
--- a/devel/ruby-gems/Makefile
+++ b/devel/ruby-gems/Makefile
@@ -19,18 +19,18 @@ LICENSE_FILE_RUBY=	${WRKSRC}/LICENSE.txt
 USES=		tar:tgz
 USE_RUBY=	yes
 
-GEMS_VER_DIR=	lib/ruby/gems/${RUBY_VER}
-GEMS_ENV=	DONT_USE_BUNDLER_FOR_GEMDEPS=true GEM_HOME=${STAGEDIR}${PREFIX}/${GEMS_VER_DIR}
+GEMS_BASE_DIR=	lib/ruby/gems/${RUBY_VER}
+GEMS_ENV=	DONT_USE_BUNDLER_FOR_GEMDEPS=true GEM_HOME=${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}
 NO_ARCH=	yes
 NO_BUILD=	yes
 RUBY_SETUP=	setup.rb
 RUBY_SETUP_OPTIONS=	--destdir=${STAGEDIR} --no-regenerate-binstubs
 
-CACHE_DIR=	${GEMS_VER_DIR}/cache
-DOC_DIR=	${GEMS_VER_DIR}/doc
-EXT_DIR=	${GEMS_VER_DIR}/extensions
-GEMS_DIR=	${GEMS_VER_DIR}/gems
-SPEC_DIR=	${GEMS_VER_DIR}/specifications
+CACHE_DIR=	${GEMS_BASE_DIR}/cache
+DOC_DIR=	${GEMS_BASE_DIR}/doc
+EXT_DIR=	${GEMS_BASE_DIR}/extensions
+GEMS_DIR=	${GEMS_BASE_DIR}/gems
+SPEC_DIR=	${GEMS_BASE_DIR}/specifications
 
 PLIST_SUB=	GEMS_DIR="${GEMS_DIR}" \
 		DOC_DIR="${DOC_DIR}" \
@@ -43,8 +43,8 @@ OPTIONS_DEFINE=	DOCS
 DOCS_VARS_OFF=	RUBY_SETUP_OPTIONS+="--no-ri --no-rdoc"
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/${GEMS_VER_DIR}
-	${MKDIR} ${STAGEDIR}${PREFIX}/${GEMS_VER_DIR}/build_info
+	${MKDIR} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}
+	${MKDIR} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}/build_info
 	${MKDIR} ${STAGEDIR}${PREFIX}/${CACHE_DIR}
 	${MKDIR} ${STAGEDIR}${PREFIX}/${DOC_DIR}
 	${MKDIR} ${STAGEDIR}${PREFIX}/${EXT_DIR}