diff --git a/deskutils/aspostit/Makefile b/deskutils/aspostit/Makefile
index 6fb34c77e4a6..6770a2be5783 100644
--- a/deskutils/aspostit/Makefile
+++ b/deskutils/aspostit/Makefile
@@ -1,25 +1,32 @@
 PORTNAME=	aspostit
 PORTVERSION=	1.3
 PORTREVISION=	6
 CATEGORIES=	deskutils
 MASTER_SITES=	AFTERSTEP/apps/aspostit
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	AfterStep dockable version of XPostIt
 
 LICENSE=	GPLv2+
 
-USE_XORG=	xpm xaw xext x11
 USES=		gmake jpeg xorg
+USE_XORG=	xpm xaw xext x11
+
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	bin/aspostit man/man1/aspostit.1.gz
 
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
+CFLAGS+=	-Wno-error=int-conversion
+.endif
+
 post-extract:
 	@${LN} -sf aspostit.man ${WRKSRC}/aspostit.1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/aspostit ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/aspostit.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>