diff --git a/sysutils/battray/Makefile b/sysutils/battray/Makefile
index 2f07b5e82ed4..75425f8604cd 100644
--- a/sysutils/battray/Makefile
+++ b/sysutils/battray/Makefile
@@ -2,21 +2,23 @@
 # $FreeBSD$
 
 PORTNAME=	battray
+DISTVERSIONPREFIX=	version-
 DISTVERSION=	2.3
 PORTREVISION=	1
 CATEGORIES=	sysutils python
-DISTVERSIONPREFIX=	version-
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Display notebook battery status in tray
 
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		python:3.3+
 USE_GNOME=	pygobject3
 USE_PYTHON=	autoplist distutils optsuffix
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	Carpetsmoker
+GH_ACCOUNT=	arp242
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/sysutils/battray/distinfo b/sysutils/battray/distinfo
index 5a1af4c8a591..521b57b2e69c 100644
--- a/sysutils/battray/distinfo
+++ b/sysutils/battray/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1511432618
-SHA256 (Carpetsmoker-battray-version-2.3_GH0.tar.gz) = ec0517d389d74ceb6471390051079e80ae53fa287090b9f90813575b593ba56d
-SIZE (Carpetsmoker-battray-version-2.3_GH0.tar.gz) = 68972
+SHA256 (arp242-battray-version-2.3_GH0.tar.gz) = ec0517d389d74ceb6471390051079e80ae53fa287090b9f90813575b593ba56d
+SIZE (arp242-battray-version-2.3_GH0.tar.gz) = 68972
diff --git a/sysutils/battray/pkg-descr b/sysutils/battray/pkg-descr
index 9314c57a6636..ac01d6dc47dd 100644
--- a/sysutils/battray/pkg-descr
+++ b/sysutils/battray/pkg-descr
@@ -6,4 +6,4 @@ It is also able to take certain actions depending on battery status.
 It's simple, easy, fairly environment-independent, and "just works" without
 tons of (Gnome|KDE|..) dependencies.
 
-WWW: http://code.arp242.net/battray
+WWW: https://github.com/arp242/battray