diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index ae6c2a8..83ae858 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -203,6 +203,8 @@ CONFIG_SCSI_IPR=m
 # CONFIG_SCSI_MVSAS_TASKLET is not set
 CONFIG_SCSI_OSD_INITIATOR=m
 CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_SCSI_SPI_ATTRS=y
+CONFIG_SCSI_SYM53C8XX_2=y
 CONFIG_SENSORS_AK8975=m
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_PCI=y
@@ -321,6 +323,11 @@ CONFIG_VIDEO_TVAUDIO=m
 # CONFIG_VIDEO_TVP514X is not set
 CONFIG_VIDEO_TVP5150=m
 CONFIG_VIDEO_VPX3220=m
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_BLK=y
+CONFIG_VIRTIO_NET=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_RING=y
 CONFIG_VITESSE_PHY=y
 CONFIG_VME_BUS=m
 CONFIG_VME_CA91CX42=m
diff --git a/debian.master/config/amd64/config.flavour.generic b/debian.master/config/amd64/config.flavour.generic
index a3d1808..7480548 100644
--- a/debian.master/config/amd64/config.flavour.generic
+++ b/debian.master/config/amd64/config.flavour.generic
@@ -5,17 +5,9 @@ CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_INTEL_IDLE=y
-# CONFIG_MEMORY_HOTPLUG is not set
 CONFIG_NR_CPUS=256
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_VIRTIO=m
-CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_NET=m
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_RING=m
 CONFIG_XEN_BLKDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_XENBUS_FRONTEND=m
diff --git a/debian.master/config/amd64/config.flavour.server b/debian.master/config/amd64/config.flavour.server
index fa42131..25f0760 100644
--- a/debian.master/config/amd64/config.flavour.server
+++ b/debian.master/config/amd64/config.flavour.server
@@ -1,21 +1,13 @@
 #
 # Config options for config.flavour.server automatically generated by splitconfig.pl
 #
-# CONFIG_DEFAULT_CFQ is not set
-CONFIG_DEFAULT_DEADLINE=y
-CONFIG_DEFAULT_IOSCHED="deadline"
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_INTEL_IDLE=y
-CONFIG_MEMORY_HOTPLUG=y
 CONFIG_NR_CPUS=256
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_SCSI_SPI_ATTRS=y
-CONFIG_SCSI_SYM53C8XX_2=y
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_BLK=y
-CONFIG_VIRTIO_NET=y
-CONFIG_VIRTIO_PCI=y
-CONFIG_VIRTIO_RING=y
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_XEN_BLKDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_XENBUS_FRONTEND=m
diff --git a/debian.master/config/amd64/config.flavour.virtual b/debian.master/config/amd64/config.flavour.virtual
index ed3931c..7d69a12 100644
--- a/debian.master/config/amd64/config.flavour.virtual
+++ b/debian.master/config/amd64/config.flavour.virtual
@@ -5,17 +5,9 @@
 CONFIG_DEFAULT_DEADLINE=y
 CONFIG_DEFAULT_IOSCHED="deadline"
 # CONFIG_INTEL_IDLE is not set
-CONFIG_MEMORY_HOTPLUG=y
 CONFIG_NR_CPUS=64
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_SCSI_SPI_ATTRS=y
-CONFIG_SCSI_SYM53C8XX_2=y
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_BLK=y
-CONFIG_VIRTIO_NET=y
-CONFIG_VIRTIO_PCI=y
-CONFIG_VIRTIO_RING=y
 CONFIG_XEN_BLKDEV_FRONTEND=y
 CONFIG_XEN_NETDEV_FRONTEND=y
 CONFIG_XEN_XENBUS_FRONTEND=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index f77c767..66cebe4 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2955,6 +2955,7 @@ CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_SAS=m
 # CONFIG_MELAN is not set
 CONFIG_MEMORY_FAILURE=y
+CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTPLUG_SPARSE=y
 CONFIG_MEMSTICK=m
 # CONFIG_MEMSTICK_DEBUG is not set
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 31e823c..c6fefd3 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -117,7 +117,6 @@ CONFIG_MACH_NO_WESTBRIDGE=y
 CONFIG_MANTIS_CORE=m
 CONFIG_MARVELL_PHY=m
 CONFIG_MAX_RAW_DEVS=256
-CONFIG_MEMORY_HOTPLUG=y
 # CONFIG_MEMORY_HOTREMOVE is not set
 CONFIG_MFD_JANZ_CMODIO=m
 # CONFIG_MFD_TMIO is not set
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index c9f6401..fd932f9 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -132,7 +132,6 @@ CONFIG_MANTIS_CORE=m
 CONFIG_MARVELL_PHY=m
 CONFIG_MAX_ACTIVE_REGIONS=256
 CONFIG_MAX_RAW_DEVS=8192
-CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTREMOVE=y
 CONFIG_MFD_JANZ_CMODIO=m
 # CONFIG_MFD_TMIO is not set