diff --git a/srcpkgs/sam/template b/srcpkgs/sam/template
index 74c8785805e..fda8f0f7a69 100644
--- a/srcpkgs/sam/template
+++ b/srcpkgs/sam/template
@@ -1,21 +1,23 @@
 # Template file for 'sam'
 pkgname=sam
-version=20150204
-revision=2
-wrksrc="${pkgname}"
+version=20160520
+revision=1
+_githash=4376931065dc54bed8eb859bd7111660bf3d4923
+wrksrc="${pkgname}-${_githash}"
 disable_parallel_build=yes
 makedepends="libXft-devel libXt-devel"
 short_desc="Screen editor with structural regular expressions"
 maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
 license="MIT-like"
 homepage="http://www.deadpixi.com/an-updated-version-of-sam"
-distfiles="http://www.deadpixi.com/an-updated-version-of-sam/sam.tar.gz?attredirects=0&d=1>sam.tar.gz"
-checksum=65006c3a7bcd5f4431719c2504dbce40f3ffbb53eb8e7114f0ab093c377f6a02
+distfiles="https://github.com/deadpixi/${pkgname}/archive/${_githash}.tar.gz"
+checksum=417327e01e564b69a76773646239556773e13061f1a9d7b23ad1a0530402ce2e
 
 post_extract() {
-	rm -f */*.a
+	sed -i '/-o sam/s/$/ $(LDFLAGS)/' sam/Makefile
+	sed -i '/-o samterm/s/$/ $(LDFLAGS)/' samterm/Makefile
+	sed -i '1iall:' doc/Makefile
 }
-
 do_build() {
 	case "$XBPS_TARGET_MACHINE" in
 		i686*|armv*) USE64BITS=0;;
@@ -23,23 +25,16 @@ do_build() {
 		*) msg_error "Unknown word length for $XBPS_TARGET_MACHINE";;
 	esac
 
-	make ${makejobs} CC="${CC} ${CFLAGS} \$(SYSFLAGS)" DESTDIR=/usr \
+	make ${makejobs} CC="${CC} ${CFLAGS}" DESTDIR=/usr LDFLAGS="$LDFLAGS" \
 		FREETYPEINC=${XBPS_CROSS_BASE}/usr/include/freetype2 \
 		RXSAMNAME=rsam TERMNAME=/usr/bin/samterm USE64BITS=${USE64BITS}
 }
 
 do_install() {
-	vbin sam/sam
-	vbin sam/samsave
-	vbin samterm/samterm
-	vbin rsam/rsam
-	vbin doc/B
-	vman doc/sam.1
-	ln -s sam.1 ${DESTDIR}/usr/share/man/man1/samterm.1
-	ln -s sam.1 ${DESTDIR}/usr/share/man/man1/B.1
-	ln -s sam.1 ${DESTDIR}/usr/share/man/man1/sam.save.1
-	ln -s sam.1 ${DESTDIR}/usr/share/man/man1/samsave.1
-	ln -s sam.1 ${DESTDIR}/usr/share/man/man1/rsam.1
+	vmkdir usr/bin
+	vmkdir usr/share/man/man1
+	make install DESTDIR=${DESTDIR}/usr
+
 	vlicense LICENSE
 	vdoc README
 	vdoc doc/se.ps