diff --git a/mail/pantomime/Makefile b/mail/pantomime/Makefile
index 6d425d6438cd..953889e35531 100644
--- a/mail/pantomime/Makefile
+++ b/mail/pantomime/Makefile
@@ -1,24 +1,31 @@
 PORTNAME=	pantomime
 PORTVERSION=	1.3.0
 PORTREVISION=	2
 CATEGORIES=	mail gnustep
 MASTER_SITES=	SAVANNAH/gnustep-nonfsf/
 DISTNAME=	Pantomime-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mail/MIME handling library for GNUstep
 WWW=		http://www.collaboration-world.com/cgi-bin/project/index.cgi?pid=3
 
 LICENSE=	LGPL21
 
 USES=		gnustep iconv ssl
 
 # The use of libiconv shouldn't be necessary, but a build dependency installs
 # it and we end up picking up the header.
-MAKE_ARGS+=	LIBRARIES_DEPEND_UPON='${ICONV_LIB} -lssl'
 USE_GNUSTEP=	back build
 USE_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
+MAKE_ARGS+=	LIBRARIES_DEPEND_UPON='${ICONV_LIB} -lssl'
+
 DEFAULT_LIBVERSION=	1.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+CFLAGS+=       -Wno-error=int-conversion
+.endif
+
+.include <bsd.port.post.mk>