diff --git a/security/libp11/Makefile b/security/libp11/Makefile
index 01d0a7da7ecb..3f0feb2548cc 100644
--- a/security/libp11/Makefile
+++ b/security/libp11/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libp11
-PORTVERSION=	0.2.3
+PORTVERSION=	0.2.4
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.opensc-project.org/files/${PORTNAME}/
 
@@ -16,27 +16,35 @@ COMMENT=	A small layer on top of PKCS\#11 API
 USE_AUTOTOOLS=	libltdl:15
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack pkgconfig
+USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
+CONFIGURE_ENV=	LTLIB_CFLAGS="-I${LOCALBASE}/include" \
+		LTLIB_LIBS="-L${LOCALBASE}/lib -lltdl" \
 		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl"
 
-DOC_FILES=	README *.sh *.xsl *.css *.html api
-
 PORTDOCS=	*
 
+.ifndef(NOPORTDOCS)
+CONFIGURE_ARGS+=--enable-doc
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \
+		${WRKSRC}/configure
+.ifndef(NOPORTDOCS)
+	@${REINPLACE_CMD} 's|install-data-am: install-apidocDATA install-dist_docDATA|install-data-am: install-dist_docDATA|' \
+		${WRKSRC}/doc/Makefile.in
+.else
+	@${REINPLACE_CMD} 's|install-data-am: install-dist_docDATA|install-data-am:|' \
+		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} 's|install-data-am: install-apidocDATA install-dist_docDATA|install-data-am:|' \
+		${WRKSRC}/doc/Makefile.in
+.endif
+
 post-install:
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA}	${WRKSRC}/examples/* ${EXAMPLESDIR}
-.ifndef(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@(cd ${WRKSRC}/doc && ${CP} -R ${DOC_FILES} ${DOCSDIR})
-.endif
 
 .include <bsd.port.mk>
diff --git a/security/libp11/distinfo b/security/libp11/distinfo
index 8f33e8e16dee..fc89c77e77d8 100644
--- a/security/libp11/distinfo
+++ b/security/libp11/distinfo
@@ -1,3 +1,3 @@
-MD5 (libp11-0.2.3.tar.gz) = 28ee2fc73fd82fbaa4a0670c972ca191
-SHA256 (libp11-0.2.3.tar.gz) = aa8051f8a2b0eda71a3e6b3e0890fecd7b5b8f1d202c4e90330bfaac03a960ed
-SIZE (libp11-0.2.3.tar.gz) = 413906
+MD5 (libp11-0.2.4.tar.gz) = 9e2c5cbececde245e2d2f535bd49ce35
+SHA256 (libp11-0.2.4.tar.gz) = 180a916e595981b5bc499722af96c621612591d496d29c3d2a2faca4eedab537
+SIZE (libp11-0.2.4.tar.gz) = 414058