diff --git a/deskutils/helpviewer/Makefile b/deskutils/helpviewer/Makefile
index 490dea5480af..a0bb761a7db7 100644
--- a/deskutils/helpviewer/Makefile
+++ b/deskutils/helpviewer/Makefile
@@ -1,25 +1,31 @@
 PORTNAME=	helpviewer
 PORTVERSION=	0.3
 PORTREVISION=	12
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	http://www.roard.com/helpviewer/download/
 DISTNAME=	HelpViewer-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Online help viewer for GNUstep programs
 WWW=		http://www.roard.com/helpviewer/
 
 LICENSE=	GPLv2
 
 USES=		gnustep tar:tgz
 USE_GNUSTEP=	back build
 
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
+ADDITIONAL_CPPFLAGS+=	-Wno-error=int-conversion
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e 's|Foundation/GSXML.h|GNUstepBase/GSXML.h|' \
 		${WRKSRC}/HandlerStructureXLP.h \
 		${WRKSRC}/TextFormatterXLP.h
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Applications/HelpViewer.app/HelpViewer
 
 .include <bsd.port.mk>