diff --git a/debian/changelog b/debian/changelog
index cd4a93cd9..9115bab7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -502,6 +502,8 @@ linux (4.15.17-1) UNRELEASED; urgency=medium
   * [armel/marvell] linux-image: Replace supported model list with wiki link
   * [armhf] udeb: Add i2c-exynos5 to i2c-modules (Closes: #895976)
   * [arm*] iio: Enable DHT11 as module (Closes: #873176)
+  * udeb: Move arc4 and ecb from nic-wireless-modules to crypto-modules
+    (Closes: #895362)
 
   [ Vagrant Cascadian ]
   * [armhf] Add patch to fix loading of imx6q-cpufreq module.
diff --git a/debian/installer/modules/crypto-modules b/debian/installer/modules/crypto-modules
index 40ee863b6..ae6434ea7 100644
--- a/debian/installer/modules/crypto-modules
+++ b/debian/installer/modules/crypto-modules
@@ -3,7 +3,9 @@ blowfish_generic
 twofish_generic
 serpent_generic
 sha256_generic
+arc4 ?
 cbc ?
 ccm
 ctr
+ecb
 xts
diff --git a/debian/installer/modules/nic-wireless-modules b/debian/installer/modules/nic-wireless-modules
index 104a3a113..09a908741 100644
--- a/debian/installer/modules/nic-wireless-modules
+++ b/debian/installer/modules/nic-wireless-modules
@@ -25,7 +25,3 @@ mac80211_hwsim -
 lib80211_crypt_wep ?
 lib80211_crypt_ccmp ?
 lib80211_crypt_tkip ?
-
-# Crypto modules needed for ieee80211 WEP support
-ecb ?
-arc4 ?