diff --git a/debian/arch/config b/debian/arch/config
index befeb67f7..39ff9fe74 100644
--- a/debian/arch/config
+++ b/debian/arch/config
@@ -1,33 +1,61 @@
+#
+# Debian toplevel config
+#
 CONFIG_MMU=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_DMI=y
+CONFIG_GENERIC_BUG=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_GENERIC_HWEIGHT=y
+
+#
+# Code maturity level options
+#
 CONFIG_EXPERIMENTAL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
 CONFIG_LOCALVERSION=""
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
+CONFIG_AUDIT=y
+# CONFIG_AUDITSYSCALL is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_INITRAMFS_SOURCE=""
 CONFIG_SYSCTL=y
-CONFIG_HOTPLUG=y
+# CONFIG_EMBEDDED is not set
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
+
+#
+# Loadable module support
+#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_KMOD=y
-CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_MISC=m
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_INITRAMFS_SOURCE=""
+
+#
+# Block layer
+#
+CONFIG_BLOCK=y
+# CONFIG_BLK_DEV_IO_TRACE is not set
+CONFIG_LSF=y
+
+#
+# IO Schedulers
+#
 CONFIG_IOSCHED_NOOP=y
 CONFIG_IOSCHED_AS=y
 CONFIG_IOSCHED_DEADLINE=y
@@ -36,6 +64,27 @@ CONFIG_IOSCHED_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+
+#
+# Processor type and features
+#
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+# CONFIG_PREEMPT_BKL is not set
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_MISC=m
+
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=m
 CONFIG_MD_LINEAR=m
@@ -292,12 +341,6 @@ CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_KOI8_R=m
 CONFIG_NLS_KOI8_U=m
 CONFIG_NLS_UTF8=m
-CONFIG_AUDIT=y
-# CONFIG_AUDITSYSCALL is not set
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_BKL is not set
 CONFIG_KEYS=y
 # CONFIG_KEYS_DEBUG_PROC_KEYS is not set
 CONFIG_SECURITY=y
@@ -530,7 +573,6 @@ CONFIG_INET_DCCP_DIAG=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_CASSINI=m
 CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_USB_STORAGE_ONETOUCH=y
 CONFIG_DRM_SAVAGE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
@@ -673,7 +715,6 @@ CONFIG_TIPC_LOG=0
 CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
 CONFIG_NETFILTER_XT_MATCH_STATE=m
 CONFIG_SCSI_QLA_FC=m
-CONFIG_DMI=y
 CONFIG_SPI_BUTTERFLY=m
 CONFIG_TIPC_SLAVE_NODES=0
 # CONFIG_TIPC_DEBUG is not set
@@ -725,7 +766,6 @@ CONFIG_VIDEO_SAA7127=m
 CONFIG_RTC_LIB=m
 CONFIG_W1_SLAVE_DS2433=m
 CONFIG_GIGASET_BASE=m
-CONFIG_LSF=y
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
 CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_IEEE80211_SOFTMAC=m
@@ -784,8 +824,6 @@ CONFIG_RTC_DRV_RS5C372=m
 CONFIG_VIDEO_WM8739=m
 CONFIG_VIDEO_CPIA2=m
 CONFIG_BCM43XX_PIO=y
-# CONFIG_BLK_DEV_IO_TRACE is not set
-CONFIG_GENERIC_HWEIGHT=y
 CONFIG_WIRELESS_EXT=y
 CONFIG_W1_SLAVE_THERM=m
 CONFIG_LEDS_TRIGGERS=y
@@ -870,7 +908,6 @@ CONFIG_PLIST=y
 CONFIG_W1_CON=y
 CONFIG_INOTIFY_USER=y
 CONFIG_RT_MUTEXES=y
-CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_RTC_DRV_V3020=m
 CONFIG_INFINIBAND_ADDR_TRANS=y
 CONFIG_ACPI_DOCK=m
@@ -959,9 +996,7 @@ CONFIG_PARPORT_NOT_PC=y
 CONFIG_PARPORT_PC_PCMCIA=m
 CONFIG_PARPORT_1284=y
 # CONFIG_INPUT_EVBUG is not set
-# CONFIG_EMBEDDED is not set
 # CONFIG_LEGACY_PTYS is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
 # CONFIG_IDE_TASK_IOCTL is not set
 CONFIG_NET_CLS=y
 CONFIG_NET_ACT_POLICE=m
@@ -1075,7 +1110,6 @@ CONFIG_SND_AC97_POWER_SAVE=y
 CONFIG_PATA_WINBOND=m
 CONFIG_JBD2=m
 CONFIG_SSFDC=m
-CONFIG_BLOCK=y
 CONFIG_DEFAULT_BIC=y
 CONFIG_CRYPTO_CBC=m
 CONFIG_TOUCHSCREEN_PENMOUNT=m
@@ -1199,8 +1233,6 @@ CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_SENSORS_PC87427=m
 CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_SYSFS_DEPRECATED=y
-CONFIG_GENERIC_BUG=y
 CONFIG_SCSI_SRP=m
 CONFIG_NF_CONNTRACK_IPV4=m
 # CONFIG_TCP_MD5SIG is not set