diff --git a/debian/changelog b/debian/changelog
index 909b2cb67..2779430ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ linux (3.18-1~exp1) UNRELEASED; urgency=medium
   * SCSI: Re-enable LIBFCOE, FCOE, FCOE_FNIC, SCSI_BNX2X_FCOE as modules
   * drivers/net: Enable ET131X as module for all architectures
   * wireless: Enable BRCMFMAC, BRCMFMAC_USB, BRCMFMAC_PCIE as modules
+  * wireless: Enable RTL8192EE, RTL8821AE as modules for all architectures
+    (replacing R8192EE, R8821AE for x86 only)
 
  -- Ben Hutchings <ben@decadent.org.uk>  Tue, 09 Dec 2014 02:08:47 +0000
 
diff --git a/debian/config/config b/debian/config/config
index fe6370872..3224764bf 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -3184,6 +3184,8 @@ CONFIG_RTL8192DE=m
 CONFIG_RTL8723AE=m
 CONFIG_RTL8723BE=m
 CONFIG_RTL8188EE=m
+CONFIG_RTL8192EE=m
+CONFIG_RTL8821AE=m
 CONFIG_RTL8192CU=m
 # CONFIG_RTLWIFI_DEBUG is not set
 
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index d41973b24..f4b263ac7 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -1496,11 +1496,6 @@ CONFIG_RTLLIB_CRYPTO_WEP=m
 ##
 CONFIG_RTL8192E=m
 
-##
-## file: drivers/staging/rtl8192ee/Kconfig
-##
-CONFIG_R8192EE=m
-
 ##
 ## file: drivers/staging/rtl8192u/Kconfig
 ##
@@ -1513,11 +1508,6 @@ CONFIG_R8723AU=m
 CONFIG_8723AU_AP_MODE=y
 CONFIG_8723AU_BT_COEXIST=y
 
-##
-## file: drivers/staging/rtl8821ae/Kconfig
-##
-CONFIG_R8821AE=m
-
 ##
 ## file: drivers/staging/rts5208/Kconfig
 ##