diff --git a/debian/changelog b/debian/changelog
index f6cf32022..81485ad56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ linux (3.16.7-ckt2-2) UNRELEASED; urgency=medium
     - [/kirkwood] mm: Disable KSM
     - [/kirkwood] Disable CHECKPOINT_RESTORE
     - [/kirkwood] Disable ZSMALLOC
+    - [/kirkwood] Disable CRYPTO_FIPS
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sat, 13 Dec 2014 11:45:48 +0000
 
diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood
index 8b7c5bd53..308e80aae 100644
--- a/debian/config/armel/config.kirkwood
+++ b/debian/config/armel/config.kirkwood
@@ -78,6 +78,11 @@ CONFIG_SGI_PARTITION=y
 CONFIG_ULTRIX_PARTITION=y
 CONFIG_SUN_PARTITION=y
 
+##
+## file: crypto/Kconfig
+##
+# CONFIG_CRYPTO_FIPS is not set
+
 ##
 ## file: drivers/ata/Kconfig
 ##
diff --git a/debian/config/armel/defines b/debian/config/armel/defines
index 16de81755..668d00bfd 100644
--- a/debian/config/armel/defines
+++ b/debian/config/armel/defines
@@ -50,6 +50,7 @@ ignore-changes:
  zs_malloc
  zs_map_object
  zs_unmap_object
+ fips_enabled
 
 [orion5x_description]
 hardware: Marvell Orion