diff --git a/debian/changelog b/debian/changelog
index 4c7a91c7e..593aaaf82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,7 +34,7 @@ linux-2.6 (2.6.25~rc5-1~experimental.1) UNRELEASED; urgency=low
   * [SECURITY]: Set DEFAULT_MMAP_MIN_ADDR to 65536 enabling low address space
     protection from user allocation - /proc/sys/vm/mmap_min_addr tunable.
   * [sparc]: Enable SCSI_SCAN_ASYNC.
-  * [i386]: Enable TC1100_WMI, SND_SIS7019.
+  * [i386]: Enable TC1100_WMI, SND_SIS7019, CRYPTO_SALSA20_586.
 
   [ Martin Michlmayr ]
   * [arm/armel] Add a kernel for Orion based devices, such as the QNAP
diff --git a/debian/config/i386/config b/debian/config/i386/config
index d2ff8155f..3f218b259 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -1384,6 +1384,7 @@ CONFIG_LATENCYTOP=y
 CONFIG_X86_FIND_SMP_CONFIG=y
 CONFIG_X86_MPPARSE=y
 CONFIG_CRYPTO_AES_586=m
+CONFIG_CRYPTO_SALSA20_586=m
 CONFIG_CRC_CCITT=m
 CONFIG_CRC32=y
 CONFIG_REED_SOLOMON=m