diff --git a/devel/ruby-build/Makefile b/devel/ruby-build/Makefile
index dae0c86173f8..5e9dfda0b4a8 100644
--- a/devel/ruby-build/Makefile
+++ b/devel/ruby-build/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	ruby-build
 PORTVERSION=	20160602
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	devel ruby
 
 MAINTAINER=	meta+ports@vmeta.jp
@@ -11,17 +12,14 @@ COMMENT=	Compile and install different ruby versions
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+# ruby-build builds Ruby so these are needed at run-time.
+# warnings by portlint are not correct. keep this.
 RUN_DEPENDS=	autoconf>0:devel/autoconf \
 		curl:ftp/curl \
 		gmake:devel/gmake
 
-OPTIONS_DEFINE=	RBENV
-RBENV_DESC=	Install rbenv for installation support
-OPTIONS_DEFAULT=	RBENV
-RBENV_RUN_DEPENDS=	rbenv:devel/rbenv
-
 USE_GITHUB=	yes
-GH_ACCOUNT=	sstephenson
+GH_ACCOUNT=	rbenv
 
 NO_BUILD=	yes
 NO_ARCH=	yes
@@ -31,6 +29,11 @@ PLIST_FILES=	bin/ruby-build \
 		libexec/rbenv-uninstall
 PORTDATA=	*
 
+OPTIONS_DEFINE=	RBENV
+RBENV_DESC=	Install rbenv for installation support
+OPTIONS_DEFAULT=	RBENV
+RBENV_RUN_DEPENDS=	rbenv:devel/rbenv
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/ruby-build ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/rbenv-install ${STAGEDIR}${PREFIX}/libexec
diff --git a/devel/ruby-build/distinfo b/devel/ruby-build/distinfo
index dee8e26fdda0..e80f27bdc31d 100644
--- a/devel/ruby-build/distinfo
+++ b/devel/ruby-build/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1465262938
-SHA256 (sstephenson-ruby-build-v20160602_GH0.tar.gz) = 4a3d702a9b86876be38c832ba65bce9da451fa9ca8dbee2022e55e72dc3cdd62
-SIZE (sstephenson-ruby-build-v20160602_GH0.tar.gz) = 50283
+TIMESTAMP = 1470185519
+SHA256 (rbenv-ruby-build-v20160602_GH0.tar.gz) = 4a3d702a9b86876be38c832ba65bce9da451fa9ca8dbee2022e55e72dc3cdd62
+SIZE (rbenv-ruby-build-v20160602_GH0.tar.gz) = 50283
diff --git a/devel/ruby-build/pkg-descr b/devel/ruby-build/pkg-descr
index d7c8ebb00d05..31ad04c49d1c 100644
--- a/devel/ruby-build/pkg-descr
+++ b/devel/ruby-build/pkg-descr
@@ -1,6 +1,7 @@
-ruby-build is a rbenv plugin that provides a rbenv install command to compile
-and install different versions of Ruby on UNIX-like systems. You can also use
-ruby-build without rbenv in environments where you need precise control over
-Ruby version installation.
+ruby-build is an rbenv plugin that provides an rbenv install command to compile
+and install different versions of Ruby on UNIX-like systems.
 
-WWW: https://github.com/sstephenson/ruby-build
+You can also use ruby-build without rbenv in environments where you need
+precise control over Ruby version installation.
+
+WWW: https://github.com/rbenv/ruby-build