diff --git a/debian/changelog b/debian/changelog
index 656c05107..967883da3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ linux (3.16.2-4) UNRELEASED; urgency=medium
 
   [ Ian Campbell ]
   * [armhf] Enable support for Exynos5 systems. (Closes: #759291)
+  * [arm64] Enable crypto accelerator modules
 
   [ Aurelien Jarno ]
   * [powerpc/powerpc64,ppc64el] Backport more KVM patches from 3.17. Enable
diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index 49211b1bd..a64c5776e 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -7,6 +7,18 @@ CONFIG_SMP=y
 CONFIG_XEN=y
 CONFIG_COMPAT=y
 
+##
+## file: arch/arm64/crypto/Kconfig
+##
+CONFIG_ARM64_CRYPTO=y
+CONFIG_CRYPTO_SHA1_ARM64_CE=m
+CONFIG_CRYPTO_SHA2_ARM64_CE=m
+CONFIG_CRYPTO_GHASH_ARM64_CE=m
+CONFIG_CRYPTO_AES_ARM64_CE=m
+CONFIG_CRYPTO_AES_ARM64_CE_CCM=m
+CONFIG_CRYPTO_AES_ARM64_CE_BLK=m
+# CONFIG_CRYPTO_AES_ARM64_NEON_BLK is not set
+
 ##
 ## file: drivers/ata/Kconfig
 ##
diff --git a/debian/patches/bugfix/arm64/arm64-crypto-fix-makefile-rule-for-aes-glue-.o.patch b/debian/patches/bugfix/arm64/arm64-crypto-fix-makefile-rule-for-aes-glue-.o.patch
new file mode 100644
index 000000000..2517f37bd
--- /dev/null
+++ b/debian/patches/bugfix/arm64/arm64-crypto-fix-makefile-rule-for-aes-glue-.o.patch
@@ -0,0 +1,37 @@
+From 7c2105fbe9658d6cee18751568e29579bb58bfec Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab@suse.de>
+Date: Thu, 24 Jul 2014 17:03:26 +0100
+Subject: [PATCH] arm64/crypto: fix makefile rule for aes-glue-%.o
+
+This fixes the following build failure when building with CONFIG_MODVERSIONS
+enabled:
+
+  CC [M]  arch/arm64/crypto/aes-glue-ce.o
+ld: cannot find arch/arm64/crypto/aes-glue-ce.o: No such file or directory
+make[1]: *** [arch/arm64/crypto/aes-ce-blk.o] Error 1
+make: *** [arch/arm64/crypto] Error 2
+
+The $(obj)/aes-glue-%.o rule only creates $(obj)/.tmp_aes-glue-ce.o, it
+should use if_changed_rule instead of if_changed_dep.
+
+Signed-off-by: Andreas Schwab <schwab@suse.de>
+[ardb: mention CONFIG_MODVERSIONS in commit log]
+Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
+Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
+---
+ arch/arm64/crypto/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm64/crypto/Makefile b/arch/arm64/crypto/Makefile
+index 2070a56..a3f935f 100644
+--- a/arch/arm64/crypto/Makefile
++++ b/arch/arm64/crypto/Makefile
+@@ -35,4 +35,4 @@ AFLAGS_aes-neon.o	:= -DINTERLEAVE=4
+ CFLAGS_aes-glue-ce.o	:= -DUSE_V8_CRYPTO_EXTENSIONS
+ 
+ $(obj)/aes-glue-%.o: $(src)/aes-glue.c FORCE
+-	$(call if_changed_dep,cc_o_c)
++	$(call if_changed_rule,cc_o_c)
+-- 
+2.1.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 9b8d9c47c..b09855200 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -59,6 +59,7 @@ bugfix/mips/MIPS-prevent-user-from-setting-FCSR-cause-bits.patch
 bugfix/mips/MIPS-Remove-BUG_ON-is_fpu_owner-in-do_ade.patch
 bugfix/x86/x86-reject-x32-executables-if-x32-abi-not-supported.patch
 bugfix/s390/s390-3215-fix-hanging-console-issue.patch
+bugfix/arm64/arm64-crypto-fix-makefile-rule-for-aes-glue-.o.patch
 
 # Arch features
 features/mips/MIPS-Support-hard-limit-of-cpu-count-nr_cpu_ids.patch