diff --git a/srcpkgs/b2sum/template b/srcpkgs/b2sum/template
index d2f7e8bb6fa..efbd2697b88 100644
--- a/srcpkgs/b2sum/template
+++ b/srcpkgs/b2sum/template
@@ -1,26 +1,27 @@
 # Template file for 'b2sum'
 pkgname=b2sum
-version=20150531
+version=20160619
 revision=1
-wrksrc="blake2_code_${version}"
-build_wrksrc=b2sum
+wrksrc="BLAKE2-${version}"
+build_wrksrc="b2sum"
 build_style=gnu-makefile
-hostmakedepends="unzip"
 short_desc="Compute BLAKE2 cryptographic hash"
 maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
-license="Public Domain"
+license="CC0-1.0"
 homepage="https://blake2.net/"
-distfiles="https://blake2.net/blake2_code_${version}.zip"
-checksum=37168711cddb349e7462bcc4874992a8e1c66de2318a20507b498be2d7c7d1e7
+distfiles="https://github.com/BLAKE2/BLAKE2/archive/${version}.tar.gz"
+checksum=cbac833ccae56b5c6173dbeaf871aa99b32745cf7a994c7451d4533ecda55633
 
 do_build() {
 	case "$XBPS_TARGET_MACHINE" in
 		i686*|x86_64*) _dir=../sse; CFLAGS+=" -msse2";;
 		*) _dir=../ref;;
 	esac
-	${CC} -std=c99 ${CFLAGS} -o b2sum *.c ${_dir}/blake*.c -I${_dir} ${LDFLAGS}
+	${CC} -std=c99 ${CFLAGS} -o b2sum \
+		*.c ${_dir}/blake*.c -I${_dir} ${LDFLAGS}
 }
 
 do_install() {
 	vbin b2sum
+	vman b2sum.1
 }