diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 1c1399d111..fa6328278e 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,12 +1,12 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=1.6.6
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--with-crypto_backend=openssl"
+configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)"
 hostmakedepends="pkg-config"
-makedepends="popt-devel libuuid-devel device-mapper-devel libressl-devel"
-short_desc="Setup virtual encryption devices under dm-crypt Linux"
+makedepends="popt-devel libuuid-devel device-mapper-devel libressl-devel $(vopt_if pwquality libpwquality-devel)"
+short_desc="Setup virtual encryption devices under Linux dm-crypt"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="http://code.google.com/p/cryptsetup"
@@ -16,20 +16,12 @@ checksum=2d2ce28e4e1137dd599d87884b62ef6dbf14fd7848b2a2bf7d61cf125fbd8e6f
 build_options="pwquality"
 desc_option_pwquality="Enable support for checking password quality via libpwquality"
 
-if [ "$build_option_pwquality" ]; then
-	configure_args+=" --enable-pwquality"
-	makedepends+=" libpwquality-devel"
-else
-	configure_args+=" --disable-pwquality"
-fi
-
 libcryptsetup_package() {
 	short_desc+=" - runtime libraries"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
 	}
 }
-
 cryptsetup-devel_package() {
 	depends="libcryptsetup>=${version}_${revision}"
 	short_desc+=" - development files"