diff --git a/libguestfs.changes b/libguestfs.changes
index daee332..073c7dc 100644
--- a/libguestfs.changes
+++ b/libguestfs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan 20 19:41:24 CET 2014 - ohering@suse.de
+
+- Include crypto modules in appliance to enable luks related commands
+
 -------------------------------------------------------------------
 Mon Jan 20 11:34:25 CET 2014 - ohering@suse.de
 
diff --git a/libguestfs.mkinitrd.boot.sh b/libguestfs.mkinitrd.boot.sh
index 765f5c8..1426d83 100644
--- a/libguestfs.mkinitrd.boot.sh
+++ b/libguestfs.mkinitrd.boot.sh
@@ -83,6 +83,114 @@
 #%udevmodules: nfsv4
 #%udevmodules: ipv6
 #
+#%udevmodules: dm-crypt
+#
+#%udevmodules: ablk_helper
+#%udevmodules: aes-i586
+#%udevmodules: aes-x86_64
+#%udevmodules: aes_s390
+#%udevmodules: aesni-intel
+#%udevmodules: af_alg
+#%udevmodules: algif_hash
+#%udevmodules: algif_skcipher
+#%udevmodules: ansi_cprng
+#%udevmodules: anubis
+#%udevmodules: arc4
+#%udevmodules: asymmetric_keys
+#%udevmodules: async_memcpy
+#%udevmodules: async_pq
+#%udevmodules: async_raid6_recov
+#%udevmodules: async_tx
+#%udevmodules: async_xor
+#%udevmodules: authenc
+#%udevmodules: authencesn
+#%udevmodules: blowfish-x86_64
+#%udevmodules: blowfish_common
+#%udevmodules: blowfish_generic
+#%udevmodules: camellia-aesni-avx-x86_64
+#%udevmodules: camellia-x86_64
+#%udevmodules: camellia_generic
+#%udevmodules: cast5-avx-x86_64
+#%udevmodules: cast5_generic
+#%udevmodules: cast6-avx-x86_64
+#%udevmodules: cast6_generic
+#%udevmodules: cast_common
+#%udevmodules: cbc
+#%udevmodules: ccm
+#%udevmodules: cmac
+#%udevmodules: crc32
+#%udevmodules: crc32-pclmul
+#%udevmodules: crc32c-intel
+#%udevmodules: cryptd
+#%udevmodules: crypto_null
+#%udevmodules: crypto_user
+#%udevmodules: ctr
+#%udevmodules: cts
+#%udevmodules: deflate
+#%udevmodules: des_generic
+#%udevmodules: des_s390
+#%udevmodules: ecb
+#%udevmodules: fcrypt
+#%udevmodules: gcm
+#%udevmodules: geode-aes
+#%udevmodules: gf128mul
+#%udevmodules: ghash-clmulni-intel
+#%udevmodules: ghash-generic
+#%udevmodules: glue_helper
+#%udevmodules: hifn_795x
+#%udevmodules: khazad
+#%udevmodules: lrw
+#%udevmodules: lz4
+#%udevmodules: lz4hc
+#%udevmodules: md4
+#%udevmodules: md5
+#%udevmodules: michael_mic
+#%udevmodules: padlock-aes
+#%udevmodules: padlock-sha
+#%udevmodules: pcbc
+#%udevmodules: pcrypt
+#%udevmodules: prng
+#%udevmodules: public_key
+#%udevmodules: raid6test
+#%udevmodules: rmd128
+#%udevmodules: rmd160
+#%udevmodules: rmd256
+#%udevmodules: rmd320
+#%udevmodules: rsa
+#%udevmodules: salsa20-i586
+#%udevmodules: salsa20-x86_64
+#%udevmodules: salsa20_generic
+#%udevmodules: seed
+#%udevmodules: seqiv
+#%udevmodules: serpent-avx-x86_64
+#%udevmodules: serpent-sse2-i586
+#%udevmodules: serpent-sse2-x86_64
+#%udevmodules: serpent_generic
+#%udevmodules: sha1-ssse3
+#%udevmodules: sha1_generic
+#%udevmodules: sha1_s390
+#%udevmodules: sha256-ssse3
+#%udevmodules: sha256_generic
+#%udevmodules: sha256_s390
+#%udevmodules: sha512-ssse3
+#%udevmodules: sha512_generic
+#%udevmodules: sha512_s390
+#%udevmodules: sha_common
+#%udevmodules: tea
+#%udevmodules: tgr192
+#%udevmodules: twofish-avx-x86_64
+#%udevmodules: twofish-i586
+#%udevmodules: twofish-x86_64
+#%udevmodules: twofish-x86_64-3way
+#%udevmodules: twofish_common
+#%udevmodules: vmac
+#%udevmodules: wp512
+#%udevmodules: x509_key_parser
+#%udevmodules: xcbc
+#%udevmodules: xor
+#%udevmodules: xts
+#%udevmodules: zlib
+#
 #%programs: mdadm
 #%programs: modprobe
 #%programs: lvm
@@ -113,6 +221,12 @@ missing_commands="@GUESTFS_MISSING_CMDS@"
 # run_all.sh will load them after this script is sourced
 load_modules
 
+# load various modules for cryptsetup
+for i in 512 384 256 224 1
+do
+	modprobe -v sha$i
+done
+
 ln -sfbn ../proc/self/mounts /etc/mtab
 
 # from libguestfs-1.19.34/appliance/init: