diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index f0ac2ed466c..2281c9e5cfe 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,24 +1,17 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
-version=1.6.3
+version=1.6.4
 revision=1
 build_style=gnu-configure
-configure_args="--enable-pwquality"
+configure_args="--enable-pwquality --with-libgcrypt-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config"
 makedepends="popt-devel libuuid-devel device-mapper-devel libgcrypt-devel libpwquality-devel"
 short_desc="Setup virtual encryption devices under dm-crypt Linux"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="http://code.google.com/p/cryptsetup"
-distfiles="https://cryptsetup.googlecode.com/files/$pkgname-$version.tar.bz2"
-checksum=a2af4731d9442cb70bc84b7cecdd069493055d29ab65ab625c574b0f599938d8
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" libtool automake gettext-devel libgcrypt-devel"
-	pre_configure() {
-		autoreconf -fi
-	}
-fi
+distfiles="https://www.kernel.org/pub/linux/utils/cryptsetup/v1.6/${pkgname}-${version}.tar.xz"
+checksum=70b8e86eef94bbb4441ad38460d87138130d7aaaafe5d01131c3ba50b9f0dca0
 
 libcryptsetup_package() {
 	short_desc+=" - runtime libraries"