Index: Mk/Uses/gem.mk
===================================================================
--- Mk/Uses/gem.mk
+++ Mk/Uses/gem.mk
@@ -36,7 +36,7 @@
 CACHE_DIR=	${GEMS_BASE_DIR}/cache
 SPEC_DIR=	${GEMS_BASE_DIR}/specifications
 EXT_DIR=	${GEMS_BASE_DIR}/extensions
-GEM_NAME?=	${PORTNAME}-${PORTVERSION}
+GEM_NAME?=	${DISTNAME}
 GEM_LIB_DIR?=	${GEMS_DIR}/${GEM_NAME}
 GEM_DOC_DIR?=	${DOC_DIR}/${GEM_NAME}
 GEM_SPEC?=	${SPEC_DIR}/${GEM_NAME}.gemspec
Index: converters/rubygem-bsdconv/Makefile
===================================================================
--- converters/rubygem-bsdconv/Makefile
+++ converters/rubygem-bsdconv/Makefile
@@ -15,7 +15,6 @@
 LIB_DEPENDS=	libbsdconv.so:converters/bsdconv
 
 CONFIGURE_ARGS=	--with-bsdconv-dir=${LOCALBASE}
-GEM_NAME=	${DISTNAME}
 USE_RUBY=	yes
 USES=		gem
 
Index: devel/rubygem-ascii85/Makefile
===================================================================
--- devel/rubygem-ascii85/Makefile
+++ devel/rubygem-ascii85/Makefile
@@ -12,9 +12,7 @@
 
 LICENSE=	MIT
 
-GEM_NAME=	${DISTNAME}
 NO_ARCH=	yes
-
 USE_RUBY=	yes
 USES=		gem
 
Index: devel/rubygem-io-like/Makefile
===================================================================
--- devel/rubygem-io-like/Makefile
+++ devel/rubygem-io-like/Makefile
@@ -25,7 +25,7 @@
 DOC_DIR=	${GEMS_BASE_DIR}/doc
 CACHE_DIR=	${GEMS_BASE_DIR}/cache
 SPEC_DIR=	${GEMS_BASE_DIR}/specifications
-GEM_NAME=	${PORTNAME}-${PORTVERSION:C/(\.[0-9]+)$//}
+GEM_NAME=	${DISTNAME:R}
 GEM_LIB_DIR=	${GEMS_DIR}/${GEM_NAME}
 GEM_DOC_DIR=	${DOC_DIR}/${GEM_NAME}
 GEM_SPEC=	${SPEC_DIR}/${GEM_NAME}.gemspec
Index: devel/rubygem-platform/Makefile
===================================================================
--- devel/rubygem-platform/Makefile
+++ devel/rubygem-platform/Makefile
@@ -10,10 +10,7 @@
 MAINTAINER=	don@na.rim.or.jp
 COMMENT=	Hopefully robust platform sensing
 
-GEM_NAME=	${DISTNAME}
-
 NO_ARCH=	yes
-
 USE_RUBY=	yes
 USES=		gem
 
Index: devel/rubygem-popen4/Makefile
===================================================================
--- devel/rubygem-popen4/Makefile
+++ devel/rubygem-popen4/Makefile
@@ -5,7 +5,7 @@
 PORTVERSION=	0.1.4
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
-DISTNAME=	${GEM_NAME}
+DISTNAME=	POpen4-${PORTVERSION}
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Cross platform API for managing child processes
@@ -17,9 +17,7 @@
 		rubygem-platform>=0.4.0:devel/rubygem-platform
 
 NO_ARCH=	yes
-
 USE_RUBY=	yes
 USES=		gem
-GEM_NAME=	POpen4-${PORTVERSION}
 
 .include <bsd.port.mk>
Index: devel/rubygem-ptreloaded/Makefile
===================================================================
--- devel/rubygem-ptreloaded/Makefile
+++ devel/rubygem-ptreloaded/Makefile
@@ -14,10 +14,7 @@
 
 LICENSE=	GPLv2
 
-GEM_NAME=	${DISTNAME}
-
 NO_ARCH=	yes
-
 USE_RUBY=	yes
 USES=		gem
 
Index: devel/rubygem-rubyinline/Makefile
===================================================================
--- devel/rubygem-rubyinline/Makefile
+++ devel/rubygem-rubyinline/Makefile
@@ -15,7 +15,6 @@
 
 RUN_DEPENDS=	rubygem-zentest>=4.3:devel/rubygem-zentest
 
-GEM_NAME=	${DISTNAME}
 NO_ARCH=	yes
 USE_RUBY=	yes
 USES=		gem shebangfix
Index: devel/rubygem-rubyinlineaccel/Makefile
===================================================================
--- devel/rubygem-rubyinlineaccel/Makefile
+++ devel/rubygem-rubyinlineaccel/Makefile
@@ -15,10 +15,7 @@
 
 LICENSE=	GPLv2
 
-GEM_NAME=	${DISTNAME}
-
 NO_ARCH=	yes
-
 USE_RUBY=	yes
 USES=		gem
 
Index: devel/rubygem-zentest/Makefile
===================================================================
--- devel/rubygem-zentest/Makefile
+++ devel/rubygem-zentest/Makefile
@@ -13,7 +13,6 @@
 
 LICENSE=	MIT
 
-GEM_NAME=	${DISTNAME}
 NO_ARCH=	yes
 USE_RUBY=	yes
 USES=		gem
Index: security/ruby-hmac/Makefile
===================================================================
--- security/ruby-hmac/Makefile
+++ security/ruby-hmac/Makefile
@@ -13,7 +13,6 @@
 
 USE_RUBY=	yes
 USES=		gem
-GEM_NAME=	${DISTNAME}
 
 DEPRECATED=	Use www/rubygem-ruby-hmac instead
 EXPIRATION_DATE=	2017-01-28
Index: security/rubygem-jugyo-twitter_oauth/Makefile
===================================================================
--- security/rubygem-jugyo-twitter_oauth/Makefile
+++ security/rubygem-jugyo-twitter_oauth/Makefile
@@ -18,7 +18,6 @@
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-GEM_NAME=	${PORTNAME}-${DISTVERSION}
 USES=		gem
 
 .include <bsd.port.mk>
Index: security/rubygem-razorback-scriptNugget/Makefile
===================================================================
--- security/rubygem-razorback-scriptNugget/Makefile
+++ security/rubygem-razorback-scriptNugget/Makefile
@@ -11,9 +11,7 @@
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Framework for an intelligence driven security - Script Nugget Ruby
 
-GEM_NAME=		${DISTNAME}
 NO_ARCH=	yes
-
 USE_RUBY=		yes
 USES=		gem shebangfix
 SHEBANG_FILES=	lib/razorback.rb
Index: sysutils/rubygem-sys-proctable/Makefile
===================================================================
--- sysutils/rubygem-sys-proctable/Makefile
+++ sysutils/rubygem-sys-proctable/Makefile
@@ -14,7 +14,6 @@
 
 RUN_DEPENDS=	rubygem-ffi>=0:devel/rubygem-ffi
 
-GEM_NAME=	${PORTNAME}-${DISTVERSIONFULL}
 NO_ARCH=	yes
 USE_RUBY=	yes
 USES=		gem
Index: textproc/rubygem-rugments/Makefile
===================================================================
--- textproc/rubygem-rugments/Makefile
+++ textproc/rubygem-rugments/Makefile
@@ -11,9 +11,7 @@
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-GEM_NAME=	${PORTNAME}-${DISTVERSION}
 NO_ARCH=	yes
-
 USE_RUBY=	yes
 USES=		gem
 
Index: www/rubygem-redcloth/Makefile
===================================================================
--- www/rubygem-redcloth/Makefile
+++ www/rubygem-redcloth/Makefile
@@ -12,7 +12,6 @@
 
 LICENSE=	MIT
 
-GEM_NAME=	${DISTNAME}
 USE_RUBY=	yes
 USES=		gem