--- a/Makefile	Fri Oct 27 09:27:50 2017 +0200
+++ b/Makefile	Sun Oct 29 19:22:43 2017 +0100
@@ -21,15 +21,18 @@
 PLIST_FILES=	bin/check-ports
 
 HGREVISION:=	${:!hg id -R "${SRC}" -q!}
-HGROOT:=	${:!basename "${SRC}"!}
+HGDATE:=	${:!hg log -R "${SRC}" -r `echo "${HGREVISION}" | tr '+' ' '` --template '{date|isodatesec}'!}
+HGAUTHOR:=	${:!hg log -R "${SRC}" -r `echo "${HGREVISION}" | tr '+' ' '` --template '{author|person}'!}
 HGPATH:=	${:!hg paths -R "${SRC}" default!}
 
 do-extract:
 	${MKDIR} ${WRKSRC}/bin
 	${CP} -R -v ${SRC}/bin/ ${WRKSRC}/bin
 .for _f in check-ports
-	${SED} -i "" -E -e "s|\\\$$HGrevision\\\$$|\$$HGrevision: ${HGREVISION} \$$|" ${WRKSRC}/bin/${_f}
-	${SED} -i "" -e "s|\\\$$HGroot\\\$$|\$$HGroot: ${HGROOT} \$$|" ${WRKSRC}/bin/${_f}
+	${SED} -i "" -E -e "s|\\\$$Date\\\$$|\$$Date: ${HGDATE} \$$|" ${WRKSRC}/bin/${_f}
+	${SED} -i "" -E -e "s|\\\$$Revision\\\$$|\$$Revision: ${HGREVISION} \$$|" ${WRKSRC}/bin/${_f}
+	${SED} -i "" -E -e "s|\\\$$Author\\\$$|\$$Author: ${HGAUTHOR} \$$|" ${WRKSRC}/bin/${_f}
+	${SED} -i "" -e "s|\\\$$HGpath\\\$$|\$$HGpath: ${HGPATH} \$$|" ${WRKSRC}/bin/${_f}
 	${SED} -i "" -e "s|\\\$$HGsource\\\$$|\$$HGsource: ${HGPATH}/bin/${_f} \$$|" ${WRKSRC}/bin/${_f}
 	${SED} -i "" -e "s|@@VERSION@@|${PORTVERSION}|" ${WRKSRC}/bin/${_f}
 .endfor