diff --git a/devel/icmake/Makefile b/devel/icmake/Makefile
index d88ebbb885e2..1f6a42663483 100644
--- a/devel/icmake/Makefile
+++ b/devel/icmake/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	icmake
-PORTVERSION=	9.02.04
+PORTVERSION=	9.02.07
 CATEGORIES=	devel
 
 MAINTAINER=	bofh@FreeBSD.org
@@ -20,7 +20,7 @@ PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 REINPLACE_ARGS=	-I ""
 
-USES=		shebangfix
+USES=		compiler shebangfix
 SHEBANG_FILES=	build comp/build comp/icm_bootstrap comp/updategrammar \
 		comp/updateparser comp/updatescanner dep/build dep/icm_bootstrap \
 		exec/build exec/icm_bootstrap exec/list/test/build exec/string/test/build \
@@ -32,6 +32,12 @@ SHEBANG_FILES=	build comp/build comp/icm_bootstrap comp/updategrammar \
 USE_GITHUB=	yes
 GH_ACCOUNT=	fbb-git
 
+.include <bsd.port.pre.mk>
+
+.if ${CHOSEN_COMPILER_TYPE} == gcc && ${COMPILER_VERSION} == 42
+CFLAGS+=	-std=gnu99
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|find|find .|g' \
 		${WRKSRC}/icm_prepare
@@ -84,4 +90,4 @@ do-build:
 do-install:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./icm_install strip all ${STAGEDIR}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/icmake/distinfo b/devel/icmake/distinfo
index 02a4c050aacf..0acab2c21dd7 100644
--- a/devel/icmake/distinfo
+++ b/devel/icmake/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1515357723
-SHA256 (fbb-git-icmake-9.02.04_GH0.tar.gz) = 611ef06fb15b1f4ab3b258395020fc88ed555b4d8934fa66a1ec8fe863f049c8
-SIZE (fbb-git-icmake-9.02.04_GH0.tar.gz) = 372166
+TIMESTAMP = 1524603312
+SHA256 (fbb-git-icmake-9.02.07_GH0.tar.gz) = fa05f0c74fb6442ddd35ad354877e185aa95bb7e0431035a79a02cdf1328260e
+SIZE (fbb-git-icmake-9.02.07_GH0.tar.gz) = 372605