diff --git a/devel/rebar/Makefile b/devel/rebar/Makefile
index 8ed11d444f8e..934158b04344 100644
--- a/devel/rebar/Makefile
+++ b/devel/rebar/Makefile
@@ -4,23 +4,23 @@
 PORTNAME=	rebar
 PORTVERSION=	2.0.0
 CATEGORIES=	devel
-MASTER_SITES=	http://github.com/basho/${PORTNAME}/tarball/${GITVERSION}/
-DISTNAME=	basho-${PORTNAME}-${GITVERSION}
 
 MAINTAINER=	koobs@FreeBSD.org
-COMMENT=	A build-tool for Erlang that follows OTP principles
+COMMENT=	Build-tool for Erlang that follows OTP principles
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/escript:${PORTSDIR}/lang/erlang
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	basho
+GH_PROJECT=	${PORTNAME}
+GH_COMMIT=	1c98f6c
+
 PLIST_FILES=	bin/${PORTNAME}
 
-GITVERSION=	1c98f6c
-
-NO_STAGE=	yes
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>
diff --git a/devel/rebar/distinfo b/devel/rebar/distinfo
index 936b7f0e4a5a..08744f5ff65a 100644
--- a/devel/rebar/distinfo
+++ b/devel/rebar/distinfo
@@ -1,2 +1,2 @@
-SHA256 (basho-rebar-1c98f6c.tar.gz) = 237561ee22e221924edbe7364b556151d1be89a3c661a1d8983c7b99384ea978
-SIZE (basho-rebar-1c98f6c.tar.gz) = 120821
+SHA256 (rebar-2.0.0.tar.gz) = 237561ee22e221924edbe7364b556151d1be89a3c661a1d8983c7b99384ea978
+SIZE (rebar-2.0.0.tar.gz) = 120821