diff --git a/mail/hbiff/Makefile b/mail/hbiff/Makefile
index a18c8bc4d636..b8151ac8d443 100644
--- a/mail/hbiff/Makefile
+++ b/mail/hbiff/Makefile
@@ -1,26 +1,32 @@
 PORTNAME=	hbiff
 PORTVERSION=	1.2
 PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	ftp://nuxi.ucdavis.edu/pub/misc/  \
 		LOCAL/obrien
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Replacement for xbiff that handles popup window with mail headers
 
-USES=		xorg
+USES=		localbase xorg
 USE_XORG=	x11
 
-CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
+CFLAGS+=	-L${LOCALBASE}/lib
 LDFLAGS+=	-lX11
 
 PLIST_FILES=	bin/hbiff man/man1/hbiff.1.gz
 
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+CFLAGS+=	-Wno-error=int-conversion
+.endif
+
 do-build:
 	${CC} ${CFLAGS} ${LDFLAGS} ${WRKSRC}/hbiff.c -o ${WRKSRC}/${PORTNAME}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>