Index: Makefile
===================================================================
--- Makefile	(revision 454535)
+++ Makefile	(working copy)
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	battray
-PORTVERSION=	2.3
+DISTVERSION=	2.3
+PORTREVISION=	1
 CATEGORIES=	sysutils python
-MASTER_SITES=	http://code.arp242.net/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/
-DISTNAME=	${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT}
 
 MAINTAINER=	tz@FreeBSD.org
 COMMENT=	Display notebook battery status in tray
@@ -12,13 +11,12 @@
 
 LICENSE=	MIT
 
+USES=		python:3.3+
 USE_GNOME=	py3gobject3
-USES=		python:3.3+
 USE_PYTHON=	autoplist distutils
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	Carpetsmoker
+GH_TAGNAME=	version-${DISTVERSION}
 
-BB_ACCOUNT=	Carpetsmoker
-BB_PROJECT=	${PORTNAME}
-BB_COMMIT=	011402fbc2a3
-
 .include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo	(revision 454535)
+++ distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1510153998
-SHA256 (Carpetsmoker-battray-011402fbc2a3.tar.gz) = eb0a647422f52aa5e719e129b555b8f57e2ca042df7a05817f14e6a6976bb31d
-SIZE (Carpetsmoker-battray-011402fbc2a3.tar.gz) = 68062
+TIMESTAMP = 1511190960
+SHA256 (Carpetsmoker-battray-2.3-version-2.3_GH0.tar.gz) = ec0517d389d74ceb6471390051079e80ae53fa287090b9f90813575b593ba56d
+SIZE (Carpetsmoker-battray-2.3-version-2.3_GH0.tar.gz) = 68972