diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
index 79b04a298a85..e76ee18c4a99 100644
--- a/mail/wmbiff/Makefile
+++ b/mail/wmbiff/Makefile
@@ -1,33 +1,38 @@
 # Created by: Jim Mock <jim@FreeBSD.org>
 
 PORTNAME=	wmbiff
 PORTVERSION=	0.4.36
+PORTREVISION=	1
 CATEGORIES=	mail windowmaker afterstep
 MASTER_SITES=	https://www.dockapps.net/download/
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	xbiff-like Window Maker dock app
 
 LICENSE=	GPLv2
 
-USES=		shebangfix xorg
+USES=		pkgconfig xorg
 
 USE_XORG=	x11 xext xpm
-SHEBANG_FILES=	scripts/security.debian.rb
 GNU_CONFIGURE=	yes
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	GNUTLS
 OPTIONS_DEFAULT=GNUTLS
 
 GNUTLS_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
 			libgnutls.so:security/gnutls \
 			libgpg-error.so:security/libgpg-error
-GNUTLS_CONFIGURE_ON=	--with-libgnutls-prefix=${LOCALBASE} \
-			--with-libgcrypt-prefix=${LOCALBASE}
+GNUTLS_CONFIGURE_ON=	--with-libgcrypt-prefix=${LOCALBASE}
 GNUTLS_CONFIGURE_OFF=	--disable-crypto
 
+post-patch:
+	@${REINPLACE_CMD} -e '/^SUBDIRS *=/ s/scripts//' \
+		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e '/security.debian.rb/ s/^/# /' \
+		${WRKSRC}/wmbiff/sample.wmbiffrc
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/wmbiff/sample.wmbiffrc ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/mail/wmbiff/pkg-plist b/mail/wmbiff/pkg-plist
index 11d5eedfb36d..c4f4b8831cc6 100644
--- a/mail/wmbiff/pkg-plist
+++ b/mail/wmbiff/pkg-plist
@@ -1,9 +1,8 @@
 bin/wmbiff
-lib/wmbiff/security.debian.rb
 man/man1/wmbiff.1.gz
 man/man5/wmbiffrc.5.gz
 %%DATADIR%%/sample.wmbiffrc
 %%DATADIR%%/skins/wmbiff-classic-master-contrast.xpm
 %%DATADIR%%/skins/wmbiff-classic-master-led.xpm
 %%DATADIR%%/skins/wmbiff-master-contrast.xpm
 %%DATADIR%%/skins/wmbiff-master-led.xpm