diff --git a/security/pivy/Makefile b/security/pivy/Makefile
index 6e12969a01e..c299c8d3eaa 100644
--- a/security/pivy/Makefile
+++ b/security/pivy/Makefile
@@ -1,4 +1,5 @@
 V =		0.9.0
+REVISION =	0
 COMMENT =	tools for using PIV tokens as an SSH agent, encryption, etc.
 DISTNAME =	pivy-$V
 
@@ -15,7 +16,10 @@ MAINTAINER =	Jonathan Matthew <jmatthew@openbsd.org>
 # MPLv2
 PERMIT_PACKAGE =	Yes
 
-WANTLIB =		c edit crypto pcsclite z
+WANTLIB =		c edit crypto pcsclite util z
+
+MODULES =		gnu
+MODGNU_CONFIG_GUESS_DIRS = openssh
 
 LIB_DEPENDS =		security/pcsc-lite
 RUN_DEPENDS =		security/ccid
@@ -26,11 +30,14 @@ NO_TEST =		Yes
 
 MAKE_FLAGS =		CC="${CC}" \
 			COPTFLAGS="${CFLAGS}" \
-			prefix=${PREFIX}
+			prefix=${PREFIX} \
+			JSONC_VER=""
+
+post-extract:
+	rm -Rf ${WRKDIST}/libressl
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pivy
 	${INSTALL_DATA} ${WRKSRC}/README.adoc ${PREFIX}/share/doc/pivy
-			    
 
 .include <bsd.port.mk>