diff --git a/srcpkgs/libu2f-server-devel b/srcpkgs/libu2f-server-devel
new file mode 120000
index 00000000000..f06be1d5280
--- /dev/null
+++ b/srcpkgs/libu2f-server-devel
@@ -0,0 +1 @@
+libu2f-server
\ No newline at end of file
diff --git a/srcpkgs/libu2f-server/patches/disable-help2man.patch b/srcpkgs/libu2f-server/patches/disable-help2man.patch
new file mode 100644
index 00000000000..36ac6e766ba
--- /dev/null
+++ b/srcpkgs/libu2f-server/patches/disable-help2man.patch
@@ -0,0 +1,24 @@
+--- src/Makefile.am.orig	2015-11-09 10:56:00.391780111 -0600
++++ src/Makefile.am	2015-11-09 10:56:14.510779188 -0600
+@@ -40,21 +40,6 @@
+ BUILT_SOURCES = cmdline.c cmdline.h
+ MAINTAINERCLEANFILES = $(BUILT_SOURCES)
+ 
+-dist_man_MANS = $(top_srcdir)/man/u2f-server.1
+-DISTCLEANFILES = $(dist_man_MANS)
+-
+-$(top_srcdir)/man/u2f-server.1: $(srcdir)/u2f-server.c $(srcdir)/cmdline.ggo $(top_srcdir)/configure.ac
+-	$(HELP2MAN) \
+-		--output=$(top_builddir)/man/$@ $(builddir)/u2f-server$(EXEEXT) \
+-		--name="Yubico Universal 2nd Factor (U2F) Server Tool" \
+-		--no-info
+-if ENABLE_H2A
+-	$(HELP2ADOC) \
+-		-e $(builddir)/u2f-server$(EXEEXT) \
+-		--name="Yubico Universal 2nd Factor (U2F) Server Tool" \
+-		> $(top_builddir)/man/$@.txt
+-endif
+-
+ clean-local:
+ 	rm -f $(top_builddir)/man/*.[1-9]
+ 	rm -f $(top_builddir)/man/*.[1-9].txt
diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
new file mode 100644
index 00000000000..e186d579d2e
--- /dev/null
+++ b/srcpkgs/libu2f-server/template
@@ -0,0 +1,35 @@
+# Template file for 'libu2f-server'
+pkgname=libu2f-server
+version=1.0.1
+revision=1
+wrksrc="${pkgname}-${pkgname}-${version}"
+build_pie=yes
+build_style=gnu-configure
+configure_args="--enable-gtk-doc-html=no"
+hostmakedepends="automake libtool pkg-config gengetopt check"
+makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
+maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+license="BSD"
+homepage="https://developers.yubico.com/libu2f-server/"
+distfiles="https://github.com/Yubico/libu2f-server/archive/libu2f-server-${version}.tar.gz"
+checksum="d87405ab7b271c3f674d64af8c878fdbf74d3b1d76b09de000c0d2cda5b44828"
+
+pre_configure() {
+	autoreconf -fi
+}
+
+post_install() {
+	vlicense COPYING LICENSE
+}
+
+libu2f-server-devel_package() {
+	short_desc+=" - development files"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/*.a
+		vmove usr/lib/*.so
+		vmove usr/lib/pkgconfig
+	}
+}
diff --git a/srcpkgs/libu2f-server/update b/srcpkgs/libu2f-server/update
new file mode 100644
index 00000000000..421b0289e21
--- /dev/null
+++ b/srcpkgs/libu2f-server/update
@@ -0,0 +1,3 @@
+site=https://github.com/Yubico/libu2f-server/releases
+pattern=tag-name">libu2f-server-\K\d+.\d+.\d+(?=<\/span>)
+version=${version//./_}