diff --git a/configure.ac b/configure.ac
index d7e54e81..1b3da23e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -273,7 +273,7 @@ saved_LIBS=$LIBS
 
 AC_ARG_ENABLE([static-cryptsetup],
 	AS_HELP_STRING([--enable-static-cryptsetup],
-	[enable build of static cryptsetup binary]))
+	[enable build of static version of tools]))
 if test x$enable_static_cryptsetup = xyes; then
 	if test x$enable_static = xno; then
 		AC_MSG_WARN([Requested static cryptsetup build, enabling static library.])
@@ -282,6 +282,11 @@ if test x$enable_static_cryptsetup = xyes; then
 fi
 AM_CONDITIONAL(STATIC_TOOLS, test x$enable_static_cryptsetup = xyes)
 
+AC_ARG_ENABLE(cryptsetup,
+	AS_HELP_STRING([--disable-cryptsetup],
+	[disable cryptsetup support]),[], [enable_cryptsetup=yes])
+AM_CONDITIONAL(CRYPTSETUP, test x$enable_cryptsetup = xyes)
+
 AC_ARG_ENABLE(veritysetup,
 	AS_HELP_STRING([--disable-veritysetup],
 	[disable veritysetup support]),[], [enable_veritysetup=yes])
diff --git a/src/Makemodule.am b/src/Makemodule.am
index 094edd3f..55a388d1 100644
--- a/src/Makemodule.am
+++ b/src/Makemodule.am
@@ -1,4 +1,6 @@
 # cryptsetup
+if CRYPTSETUP
+
 cryptsetup_SOURCES =		\
 	lib/utils_crypt.c	\
 	lib/utils_loop.c	\
@@ -26,6 +28,7 @@ cryptsetup_static_LDADD =	\
 	@PWQUALITY_STATIC_LIBS@	\
 	@DEVMAPPER_STATIC_LIBS@
 endif
+endif
 
 # veritysetup
 if VERITYSETUP