diff --git a/debian/changelog b/debian/changelog
index d41ff76cc..1f4cf8584 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,7 @@ linux-2.6 (2.6.25~rc3-1~experimental.1) UNRELEASED; urgency=low
   [ Martin Michlmayr ]
   * [arm] Add a kernel for Orion based devices, such as the QNAP
     TS-109/TS-209.
+  * [arm/armel] Unset CRYPTO_DEV_HIFN_795X since it causes a build failure.
 
   [ Daniel Baumann ]
   * Added patch from unionfs upstream to export release_open_intent symbol.
diff --git a/debian/config/arm/config b/debian/config/arm/config
index 9650148ee..3c70d6b46 100644
--- a/debian/config/arm/config
+++ b/debian/config/arm/config
@@ -26,3 +26,4 @@ CONFIG_TMPFS=y
 # CONFIG_SCSI_QLA_ISCSI is not set
 # CONFIG_SCSI_AIC94XX is not set
 # CONFIG_SCSI_HPTIOP is not set
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
diff --git a/debian/config/armel/config b/debian/config/armel/config
index 79a3ba42a..57a5de416 100644
--- a/debian/config/armel/config
+++ b/debian/config/armel/config
@@ -15,3 +15,4 @@ CONFIG_JBD=y
 CONFIG_TMPFS=y
 CONFIG_AEABI=y
 CONFIG_OABI_COMPAT=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set