diff --git a/srcpkgs/sbt/template b/srcpkgs/sbt/template
index 6847c2efef..6c554e9697 100644
--- a/srcpkgs/sbt/template
+++ b/srcpkgs/sbt/template
@@ -1,21 +1,29 @@
 # Template file for 'sbt'
 pkgname=sbt
-version=1.3.10
-revision=2
+version=1.6.1
+revision=1
 wrksrc="$pkgname"
 depends="virtual?java-environment"
 short_desc="Interactive build tool for Scala and Java"
 maintainer="Damian Czaja <trojan295@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.scala-sbt.org"
-distfiles="https://sbt-downloads.cdnedge.bluemix.net/releases/v${version}/${pkgname}-${version}.tgz"
-checksum=3060065764193651aa3fe860a17ff8ea9afc1e90a3f9570f0584f2d516c34380
+distfiles="https://github.com/sbt/sbt/releases/download/v${version}/${pkgname}-${version}.tgz"
+checksum=60286bf1b875b31e2955f8a699888cd2612e9afd94d03cde0a2e71efd7492ffc
 
 do_install() {
-	vmkdir usr/share/sbt
+	vmkdir usr/lib/sbt
 	vmkdir usr/bin
-	vcopy "*" usr/share/sbt
-	ln -rs ${DESTDIR}/usr/share/sbt/bin/sbt ${DESTDIR}/usr/bin/sbt
+	vcopy "*" usr/lib/sbt
+	ln -rs ${DESTDIR}/usr/lib/sbt/bin/sbt ${DESTDIR}/usr/bin/sbt
 
-	rm ${DESTDIR}/usr/share/${pkgname}/bin/*.bat
+	rm ${DESTDIR}/usr/lib/${pkgname}/bin/*.bat
+	rm ${DESTDIR}/usr/lib/${pkgname}/bin/*.exe
+	rm ${DESTDIR}/usr/lib/${pkgname}/bin/*apple-darwin
+
+	# Remove x86_64 binaries when it doesn't match the machine.
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64) ;;
+		*) rm ${DESTDIR}/usr/lib/${pkgname}/bin/*x86_64* ;;
+	esac
 }