diff --git a/archivers/Makefile b/archivers/Makefile
index 3deefaf29763..be50eee5c837 100644
--- a/archivers/Makefile
+++ b/archivers/Makefile
@@ -171,7 +171,7 @@
     SUBDIR += ruby-zip
     SUBDIR += rubygem-archive-tar-minitar
     SUBDIR += rubygem-archive-zip
-    SUBDIR += rubygem-bzip2
+    SUBDIR += rubygem-bzip2-ruby
     SUBDIR += rubygem-libarchive
     SUBDIR += rubygem-minitar
     SUBDIR += rubygem-rubyzip
diff --git a/archivers/rubygem-bzip2/Makefile b/archivers/rubygem-bzip2-ruby/Makefile
similarity index 77%
rename from archivers/rubygem-bzip2/Makefile
rename to archivers/rubygem-bzip2-ruby/Makefile
index 900ca3802b9f..829aeaea9ee8 100644
--- a/archivers/rubygem-bzip2/Makefile
+++ b/archivers/rubygem-bzip2-ruby/Makefile
@@ -1,12 +1,11 @@
 # Created by: Steve Wills <swills@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	bzip2
+PORTNAME=	bzip2-ruby
 PORTVERSION=	0.2.7
 PORTREVISION=	2
 CATEGORIES=	archivers rubygems
 MASTER_SITES=	RG
-DISTNAME=	${PORTNAME}-ruby-${PORTVERSION}
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby C bindings to libbzip2
@@ -16,7 +15,6 @@ LICENSE_COMB=	dual
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
-GEM_NAME=	${PORTNAME}-ruby-${PORTVERSION}
 RUBYGEM_AUTOPLIST=	yes
 
 .include <bsd.port.mk>
diff --git a/archivers/rubygem-bzip2/distinfo b/archivers/rubygem-bzip2-ruby/distinfo
similarity index 100%
rename from archivers/rubygem-bzip2/distinfo
rename to archivers/rubygem-bzip2-ruby/distinfo
diff --git a/archivers/rubygem-bzip2/files/patch-ext__bzip2.c b/archivers/rubygem-bzip2-ruby/files/patch-ext__bzip2.c
similarity index 100%
rename from archivers/rubygem-bzip2/files/patch-ext__bzip2.c
rename to archivers/rubygem-bzip2-ruby/files/patch-ext__bzip2.c
diff --git a/archivers/rubygem-bzip2/files/patch-ext__extconf.rb b/archivers/rubygem-bzip2-ruby/files/patch-ext__extconf.rb
similarity index 100%
rename from archivers/rubygem-bzip2/files/patch-ext__extconf.rb
rename to archivers/rubygem-bzip2-ruby/files/patch-ext__extconf.rb
diff --git a/archivers/rubygem-bzip2/pkg-descr b/archivers/rubygem-bzip2-ruby/pkg-descr
similarity index 100%
rename from archivers/rubygem-bzip2/pkg-descr
rename to archivers/rubygem-bzip2-ruby/pkg-descr
diff --git a/sysutils/puppet/Makefile b/sysutils/puppet/Makefile
index c6d6e1c1c0f8..3a5c91d2856e 100644
--- a/sysutils/puppet/Makefile
+++ b/sysutils/puppet/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	puppet
 PORTVERSION=	3.6.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
 
@@ -52,7 +52,7 @@ BROKEN=	PACKAGE_ROOT option patch is incompatable with PACKAGE_ORIGIN patch.
 
 .if ${PORT_OPTIONS:MPACKAGE_ORIGIN}
 EXTRA_PATCHES+=	${FILESDIR}/optpatch-package_origin
-RUN_DEPENDS+=	rubygem-bzip2>=0:${PORTSDIR}/archivers/rubygem-bzip2
+RUN_DEPENDS+=	rubygem-bzip2-ruby>=0:${PORTSDIR}/archivers/rubygem-bzip2-ruby
 .endif
 
 post-patch:
diff --git a/sysutils/puppet27/Makefile b/sysutils/puppet27/Makefile
index a4ab2e86bce7..e4d67112e0bc 100644
--- a/sysutils/puppet27/Makefile
+++ b/sysutils/puppet27/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	puppet
 PORTVERSION=	2.7.26
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
 PKGNAMESUFFIX=	27
@@ -44,7 +45,7 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .if ${PORT_OPTIONS:MPACKAGE_ORIGIN}
 EXTRA_PATCHES+=	${FILESDIR}/optpatch-package_origin
-RUN_DEPENDS+=	rubygem-bzip2>=0:${PORTSDIR}/archivers/rubygem-bzip2
+RUN_DEPENDS+=	rubygem-bzip2-ruby>=0:${PORTSDIR}/archivers/rubygem-bzip2-ruby
 .endif
 
 .if ${PORT_OPTIONS:MPACKAGE_ROOT}