diff --git a/devel/colormake/Makefile b/devel/colormake/Makefile
index a29d65948dd6..77c0c4e2854a 100644
--- a/devel/colormake/Makefile
+++ b/devel/colormake/Makefile
@@ -1,35 +1,48 @@
 PORTNAME=	colormake
-PORTVERSION=	0.9
-PORTREVISION=	1
+PORTVERSION=	0.9.20140503
 CATEGORIES=	devel
-MASTER_SITES=	http://bre.klaki.net/programs/colormake/
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Wrapper to color gmake output
-WWW=		https://bre.klaki.net/programs/colormake/
+MAINTAINER=	danfe@FreeBSD.org
+COMMENT=	Wrapper around GNU make to colorize output
+WWW=		https://github.com/pagekite/Colormake
 
-BROKEN=		Unfetchable
-DEPRECATED=	Abandoned upstream
-EXPIRATION_DATE=2025-05-31
+LICENSE=	GPLv2+
 
 RUN_DEPENDS=	gmake:devel/gmake \
 		bash:shells/bash
 
-NO_BUILD=	yes
 USES=		perl5 shebangfix
+USE_GITHUB=	yes
+GH_ACCOUNT=	pagekite
+GH_PROJECT=	Colormake
 USE_PERL5=	run
 SHEBANG_FILES=	colormake.pl
-PLIST_FILES=	bin/colormake bin/colormake.pl bin/colormake-short bin/clmake \
-		bin/clmake-short
+
+NO_ARCH=	yes
+NO_BUILD=	yes
+
+PLIST_FILES=	bin/clmake bin/clmake-short bin/colormake \
+		bin/colormake-short bin/colormake.pl \
+		share/man/man1/colormake.1.gz
+PORTDOCS=	AUTHORS BUGS ChangeLog README
+
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	cd ${WRKSRC} && \
-	${REINPLACE_CMD} -e "s,make ,gmake ,g;s,/bin/bash,${LOCALBASE}/bin/bash,g" \
-		colormake colormake-short clmake clmake-short
+	${REINPLACE_CMD} -e 's,make ,g&, ; s,/bin/bash,${LOCALBASE}&,' \
+		${WRKSRC}/colormake
 
 do-install:
 	cd ${WRKSRC} && \
-	${INSTALL_SCRIPT} colormake.pl colormake colormake-short clmake \
-		clmake-short ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} colormake.pl colormake ${STAGEDIR}${PREFIX}/bin
+.for another_name in clmake clmake-short colormake-short
+	cd ${STAGEDIR}${PREFIX}/bin && ${LN} colormake ${another_name}
+.endfor
+	${INSTALL_MAN} ${WRKSRC}/colormake.1 \
+		${STAGEDIR}${PREFIX}/share/man/man1
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/colormake/distinfo b/devel/colormake/distinfo
index 6c2e0907412d..367ebd187ed1 100644
--- a/devel/colormake/distinfo
+++ b/devel/colormake/distinfo
@@ -1,2 +1,3 @@
-SHA256 (colormake-0.9.tar.gz) = 000c629c84342c1224764e99e97ae9814ec6a7b9be0bc5922f2433db0d09c57e
-SIZE (colormake-0.9.tar.gz) = 11429
+TIMESTAMP = 1399116895
+SHA256 (pagekite-Colormake-0.9.20140503_GH0.tar.gz) = a3f9fae9a455ac96be1cce0371b28bda33a9af73b06fa8e4329aa2f693d68d22
+SIZE (pagekite-Colormake-0.9.20140503_GH0.tar.gz) = 11062
diff --git a/devel/colormake/pkg-descr b/devel/colormake/pkg-descr
index 749527046c8a..9484db22bfa8 100644
--- a/devel/colormake/pkg-descr
+++ b/devel/colormake/pkg-descr
@@ -1 +1,4 @@
-This is a simple wrapper around "make" to make its output more readable.
+This package contains colormake.pl script which parses the output of
+GNU make to colorize it and make it easier read.  In addition, there
+are two wrapper scripts included, colormake and clmake, which can be
+invoked instead of make(1) with colorized output on-the-fly.