diff --git a/debian/config/armel/defines b/debian/config/armel/defines
index e3f005b43..3d8ad9255 100644
--- a/debian/config/armel/defines
+++ b/debian/config/armel/defines
@@ -9,6 +9,8 @@ kernel-arch: arm
 
 [image]
 suggests: fdutils
+configs:
+ kernelarch-arm/config
 
 [relations]
 headers%gcc-4.8: linux-compiler-gcc-4.8-arm
diff --git a/debian/config/armhf/config b/debian/config/armhf/config
index 75a2cafe2..a639ae4cc 100644
--- a/debian/config/armhf/config
+++ b/debian/config/armhf/config
@@ -6,12 +6,6 @@ CONFIG_ATAGS_PROC=y
 #. Enable floating point unit
 CONFIG_VFP=y
 
-##
-## file: crypto/Kconfig
-##
-CONFIG_CRYPTO_SHA1_ARM=m
-CONFIG_CRYPTO_AES_ARM=m
-
 ##
 ## file: drivers/input/mouse/Kconfig
 ##
@@ -29,9 +23,3 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
 # CONFIG_BAYCOM_EPP is not set
 # CONFIG_YAM is not set
 
-##
-## file: drivers/thermal/Kconfig
-##
-CONFIG_THERMAL=y
-CONFIG_CPU_THERMAL=y
-
diff --git a/debian/config/armhf/defines b/debian/config/armhf/defines
index 33801fc3e..82ba7d77a 100644
--- a/debian/config/armhf/defines
+++ b/debian/config/armhf/defines
@@ -7,7 +7,7 @@ kernel-arch: arm
 [image]
 suggests: fdutils
 configs:
- armel/config
+ kernelarch-arm/config
  armhf/config
 
 [relations]
diff --git a/debian/config/armel/config b/debian/config/kernelarch-arm/config
similarity index 92%
rename from debian/config/armel/config
rename to debian/config/kernelarch-arm/config
index f33adc4d3..f58bd8bd9 100644
--- a/debian/config/armel/config
+++ b/debian/config/kernelarch-arm/config
@@ -46,16 +46,6 @@ CONFIG_MOUSE_APPLETOUCH=m
 ##
 CONFIG_MTD_PHYSMAP=y
 
-##
-## file: drivers/net/hamradio/Kconfig
-##
-CONFIG_BPQETHER=m
-CONFIG_BAYCOM_SER_FDX=m
-CONFIG_BAYCOM_SER_HDX=m
-CONFIG_BAYCOM_PAR=m
-CONFIG_BAYCOM_EPP=m
-CONFIG_YAM=m
-
 ##
 ## file: drivers/net/wireless/ipw2x00/Kconfig
 ##