diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk
index d8242952b9..2fed357ea8 100644
--- a/package/kernel/modules/crypto.mk
+++ b/package/kernel/modules/crypto.mk
@@ -335,6 +335,9 @@ $(eval $(call KernelPackage,crypto-sha1))
 ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.6.0)),1)
 camellia_mod_suffix=_generic
 endif
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.7.0)),1)
+cast56_mod_suffix=_generic
+endif
 
 define KernelPackage/crypto-misc
   TITLE:=Other CryptoAPI modules
@@ -359,8 +362,8 @@ define KernelPackage/crypto-misc
   FILES:= \
 	$(LINUX_DIR)/crypto/anubis.ko \
 	$(LINUX_DIR)/crypto/camellia$(camellia_mod_suffix).ko \
-	$(LINUX_DIR)/crypto/cast5.ko \
-	$(LINUX_DIR)/crypto/cast6.ko \
+	$(LINUX_DIR)/crypto/cast5$(cast56_mod_suffix).ko \
+	$(LINUX_DIR)/crypto/cast6$(cast56_mod_suffix).ko \
 	$(LINUX_DIR)/crypto/fcrypt.ko \
 	$(LINUX_DIR)/crypto/khazad.ko \
 	$(LINUX_DIR)/crypto/sha256_generic.ko \