diff --git a/security/libp11/Makefile b/security/libp11/Makefile
index 767cc617af41c..8d045903402ef 100644
--- a/security/libp11/Makefile
+++ b/security/libp11/Makefile
@@ -1,23 +1,28 @@
-# $NetBSD: Makefile,v 1.9 2014/02/12 23:18:33 tron Exp $
+# $NetBSD: Makefile,v 1.10 2014/04/02 20:14:19 gdt Exp $
 #
 
-DISTNAME=		libp11-0.2.6
-PKGREVISION=		4
+VERSION=		0.2.8
+DISTNAME=		libp11-${VERSION}
 CATEGORIES=		security
-MASTER_SITES=		http://www.opensc-project.org/files/libp11/
+MASTER_SITES=		https://github.com/OpenSC/libp11/archive/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.opensc-project.org/libp11/
+HOMEPAGE=		https://github.com/OpenSC/libp11/wiki
 COMMENT=		Convenience library for easy PKCS\#11 implementation
 LICENSE=		gnu-lgpl-v2.1
 
+WRKSRC=			${WRKDIR}/libp11-libp11-${VERSION}
+
 BUILDLINK_API_DEPENDS.openssl+=	openssl>=0.9.7
 
-USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		autoconf automake gmake pkg-config
+GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
+USE_PKGLOCALEDIR=	yes
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/src/libp11.pc.in
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake pkg-config
+
+pre-configure:
+	cd ${WRKSRC} && ./bootstrap
 
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/security/libp11/distinfo b/security/libp11/distinfo
index 1feab9c2a4168..3dacbbff2285c 100644
--- a/security/libp11/distinfo
+++ b/security/libp11/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2009/08/03 18:43:00 hasso Exp $
+$NetBSD: distinfo,v 1.3 2014/04/02 20:14:19 gdt Exp $
 
-SHA1 (libp11-0.2.6.tar.gz) = 87a7e59c1d7a93f3e1ee863ad462487c4479ae27
-RMD160 (libp11-0.2.6.tar.gz) = 0f568e22d9a5813e4fcea22fc927c3cb4b3eb93a
-Size (libp11-0.2.6.tar.gz) = 376101 bytes
-SHA1 (patch-aa) = 97e85e23d74f7fdc7db67bc8f40844679846e96c
+SHA1 (libp11-0.2.8.tar.gz) = e20a3eb67b7effc26339f1decbca85dee3d98586
+RMD160 (libp11-0.2.8.tar.gz) = 8f54c66f929fff1bc4ec548f95e7798f9992a272
+Size (libp11-0.2.8.tar.gz) = 69955 bytes
+SHA1 (patch-Makefile.am) = 5020d2b5f345f603be775b7d5bf3edb75b5a2549
diff --git a/security/libp11/patches/patch-Makefile.am b/security/libp11/patches/patch-Makefile.am
new file mode 100644
index 0000000000000..a8688b1b9d327
--- /dev/null
+++ b/security/libp11/patches/patch-Makefile.am
@@ -0,0 +1,22 @@
+$NetBSD: patch-Makefile.am,v 1.1 2014/04/02 20:14:19 gdt Exp $
+
+Don't install NEWS, as usually it is not.
+Don't install a README about a wiki copy that isn't there.
+
+These changes have not yet been submitted upstream.
+
+--- Makefile.am.orig	2011-04-15 11:52:31.000000000 +0000
++++ Makefile.am
+@@ -16,9 +16,10 @@ EXTRA_DIST = svnignore Makefile.mak winc
+ 
+ dist_noinst_DATA = COPYING bootstrap \
+ 	$(srcdir)/examples/Makefile $(srcdir)/examples/*.c $(srcdir)/examples/README
+-dist_doc_DATA = NEWS
++#dist_doc_DATA = NEWS
+ 
+-SUBDIRS = src doc
++SUBDIRS = src
++# doc
+ 
+ # Allow detection of packaged tarball
+ dist-hook:
diff --git a/security/libp11/patches/patch-aa b/security/libp11/patches/patch-aa
deleted file mode 100644
index 20121177a4c5d..0000000000000
--- a/security/libp11/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/03/05 20:28:24 hasso Exp $
-
---- Makefile.in.orig	2009-03-05 21:27:02 +0200
-+++ Makefile.in	2009-03-05 21:27:26 +0200
-@@ -232,8 +232,8 @@ EXTRA_DIST = svnignore
- dist_noinst_DATA = COPYING bootstrap \
- 	$(srcdir)/examples/Makefile $(srcdir)/examples/*.c $(srcdir)/examples/README
- 
--dist_doc_DATA = NEWS
--SUBDIRS = src doc
-+dist_doc_DATA =
-+SUBDIRS = src
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-