diff --git a/games/ctris/Makefile b/games/ctris/Makefile
index fcaacaf9e729..a096c2350550 100644
--- a/games/ctris/Makefile
+++ b/games/ctris/Makefile
@@ -2,22 +2,25 @@
 # $FreeBSD$
 
 PORTNAME=	ctris
-PORTVERSION=	0.42
+PORTVERSION=	0.42.1
+DISTVERSIONPREFIX=	v
 CATEGORIES=	games
-MASTER_SITES=	http://www.hackl.dhs.org/data/download/files/ \
-		LOCAL/ehaupt
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Colorized, small, and flexible Tetris(TM)-clone for the console
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		ncurses tar:bzip2
-MAKE_ARGS=	LIBS="${LDFLAGS} -lncurses -lm"
+USES=		ncurses
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	dominikhackl
 
 PLIST_FILES=	bin/ctris man/man6/ctris.6.gz
 
 post-patch:
+	@${REINPLACE_CMD} -e "s|v0\.42|v${PORTVERSION}|" ${WRKSRC}/ctris.h
 	@${REINPLACE_CMD} -e "s|gcc|${CC}|" -e "s|CFLAGS=.*|CFLAGS+=-Wall|" \
 		 ${WRKSRC}/Makefile
 
diff --git a/games/ctris/distinfo b/games/ctris/distinfo
index b114ac325526..d816f851e40e 100644
--- a/games/ctris/distinfo
+++ b/games/ctris/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ctris-0.42.tar.bz2) = 4f8acca2c37b53bd319aa011a59684f5051d7dcb37d4459c100ee50f66cf38b0
-SIZE (ctris-0.42.tar.bz2) = 13890
+TIMESTAMP = 1486030284
+SHA256 (dominikhackl-ctris-v0.42.1_GH0.tar.gz) = c5fe3e70b76129ea83cac85a3c5dbc084066a62d7ef4edcc73c545ee89222ed8
+SIZE (dominikhackl-ctris-v0.42.1_GH0.tar.gz) = 16116
diff --git a/games/ctris/pkg-descr b/games/ctris/pkg-descr
index e00d53a40b21..2afa485e28e5 100644
--- a/games/ctris/pkg-descr
+++ b/games/ctris/pkg-descr
@@ -1,4 +1,4 @@
 ctris is a colorized, small and flexible Tetris(TM)-clone for the console.
 It also has some small special features. (e.g. a highscore-list)
 
-WWW: http://www.hackl.dhs.org/ctris/
+WWW: https://github.com/dominikhackl/ctris/