base commit: r471035
diff --git devel/hs-ShellCheck/Makefile devel/hs-ShellCheck/Makefile
index 47f88a148a76..0b62307a892a 100644
--- devel/hs-ShellCheck/Makefile
+++ devel/hs-ShellCheck/Makefile
@@ -1,8 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	ShellCheck
-PORTVERSION=	0.4.7
-PORTREVISION=	1
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.4.7-129
+DISTVERSIONSUFFIX=	-gb5e5d24
 CATEGORIES=	devel haskell
 
 MAINTAINER=	pizzamig@FreeBSD.org
@@ -11,11 +12,12 @@ COMMENT=	Shell script analysis tool
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USE_CABAL=	json mtl>=2.2.1 QuickCheck>=2.7.4 regex-tdfa
+USE_CABAL=	aeson QuickCheck>=2.7.4 regex-tdfa
+USE_GITHUB=	yes
+GH_ACCOUNT=	koalaman
+GH_PROJECT=	${PORTNAME:tl}
 
 EXECUTABLE=	shellcheck
 
-IGNORE=		Doesn't build with recent GHC version
-
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git devel/hs-ShellCheck/distinfo devel/hs-ShellCheck/distinfo
index 62f41727665c..9641f9407a7f 100644
--- devel/hs-ShellCheck/distinfo
+++ devel/hs-ShellCheck/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1513875105
-SHA256 (cabal/ShellCheck-0.4.7.tar.gz) = 184955264d42c5dca0300fb9688b9a6c9a1c70c345dbcd8e30bb48a049a70d7c
-SIZE (cabal/ShellCheck-0.4.7.tar.gz) = 126593
+TIMESTAMP = 1527501363
+SHA256 (cabal/koalaman-shellcheck-v0.4.7-129-gb5e5d24_GH0.tar.gz) = 605f2181252827e46fe405eb60b25fcc59b5076a999958d5373a69cc1417917b
+SIZE (cabal/koalaman-shellcheck-v0.4.7-129-gb5e5d24_GH0.tar.gz) = 173745