diff --git a/lang/cim/Makefile b/lang/cim/Makefile
index 192806b22504..bfda9b1218e3 100644
--- a/lang/cim/Makefile
+++ b/lang/cim/Makefile
@@ -1,22 +1,31 @@
 PORTNAME=	cim
 PORTVERSION=	3.37
 PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	http://simula67.at.ifi.uio.no/Cim/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Compiler for the SIMULA programming language
 WWW=		http://folk.uio.no/simula67/cim.shtml
 
 LICENSE=	GPLv2
 
 USES=		libtool
-GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+
+GNU_CONFIGURE=	yes
+
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check-TESTS
+
 TEST_WRKSRC=	${WRKSRC}/test
 
 INFO=		cim
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
+CFLAGS+=	-Wno-error=int-conversion
+.endif
+
+.include <bsd.port.post.mk>