diff --git a/devel/libshbuf/Makefile b/devel/libshbuf/Makefile
index 6823b0ed71c2..05a5f9d03b8c 100644
--- a/devel/libshbuf/Makefile
+++ b/devel/libshbuf/Makefile
@@ -1,19 +1,28 @@
 PORTNAME=	libshbuf
 PORTVERSION=	0.0.3
 CATEGORIES=	devel
 MASTER_SITES=	http://0pointer.de/lennart/projects/libshbuf/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Library for Shared Buffer IPC
 WWW=		https://0pointer.de/lennart/projects/libshbuf/
 
 LICENSE=	GPLv2 # though COPYING says LGPL21
 
-USE_LDCONFIG=	yes
 USES=		pathfix libtool
+USE_LDCONFIG=	yes
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--disable-lynx --disable-doxygen
+
 INSTALL_TARGET=	install-strip
+
 CFLAGS+=	-D_WANT_SEMUN
 
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
+CFLAGS+=	-Wno-error=int-conversion
+.endif
+
 .include <bsd.port.mk>