diff --git a/sys-kernel/linux-xen-domU/Manifest b/sys-kernel/linux-xen-domU/Manifest
index b1c01097f..c7aba0139 100644
--- a/sys-kernel/linux-xen-domU/Manifest
+++ b/sys-kernel/linux-xen-domU/Manifest
@@ -1,5 +1,5 @@
-AUX linux-xen-domU-2.6.34-r4-amd64.config 40917 RMD160 d992073a99be4621dd8f82b52b871cd44a4a34fa SHA1 c1947bc76f56a26ab111f1394a450fa3e72ff8ed SHA256 436a64a12a5f272e81f0b2209c14aee461fb6ccc0bab4ae06341658b09ff0842
-AUX linux-xen-domU-2.6.34-r4-x86.config 41162 RMD160 a9639dff9596710fb82c832826f61f8ba2ca4f8e SHA1 e39daa690fc0298ea781ee25a7ac7bed9cf8d3ad SHA256 c1d8c41636e5f34ae71a14406cd780e5054f02b9c64a8cf1cf958bf0cdf8cf31
+AUX linux-xen-domU-2.6.34-r4-amd64.config 40071 RMD160 742b97feb1a90814c24337bf8688c4f2eba76f36 SHA1 51de6016e74d1f7bfdb32808f1e227008dfb601a SHA256 ba75ae2a14d80aa1365cb8c56a9832a2a223b9d207bcb746653b0ad29fb74664
+AUX linux-xen-domU-2.6.34-r4-x86.config 40134 RMD160 703e4e897b4adcc0f8d0b03b019558d9aedc4636 SHA1 790b00d9fc4c9b6da1151e9607e9f465fa0c3a01 SHA256 4b32f27b757b940d1b25188028fb4115a4d34866bc8782cf93fb24ad055461bf
 DIST genpatches-2.6.34-13.base.tar.bz2 200048 RMD160 e3e32467d3e4cd6fd6f0a7a621031e31ee001cb9 SHA1 6b3b909e890eeb2408ab75a65df32d4bf426240a SHA256 02a9a8501c05c1771e5204deb13743b7b702f9c5b2cff97d7c3a7c483d1e6090
 DIST genpatches-2.6.34-13.extras.tar.bz2 15527 RMD160 988e3878a7c2a4676988e54010e8e8c76ed9d999 SHA1 1e218561e5d5c2d86e471245819dcc8ce022905e SHA256 7e99fb2c4320446b312110fc6f9f5e2bcc60127f80f80d8cb09c34483c68dca9
 DIST linux-2.6.34.tar.bz2 67633622 RMD160 dafd721b00c13e3652405b517b379eed10020bf4 SHA1 4188857ba71f301991dc56285f593e9c311e5824 SHA256 fa395fec7de633df1cb85b6248b8f35af98380ed128a8bc465fb48bc4d252633
diff --git a/sys-kernel/linux-xen-domU/files/linux-xen-domU-2.6.34-r4-amd64.config b/sys-kernel/linux-xen-domU/files/linux-xen-domU-2.6.34-r4-amd64.config
index ebbd1e737..ba5a35f6d 100644
--- a/sys-kernel/linux-xen-domU/files/linux-xen-domU-2.6.34-r4-amd64.config
+++ b/sys-kernel/linux-xen-domU/files/linux-xen-domU-2.6.34-r4-amd64.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.34-xen-domU
-# Fri Jul 22 22:41:43 2011
+# Fri Jul 22 22:57:18 2011
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -828,45 +828,9 @@ CONFIG_HAVE_IDE=y
 #
 CONFIG_SCSI_MOD=y
 # CONFIG_RAID_ATTRS is not set
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-# CONFIG_SCSI_TGT is not set
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=m
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_CHR_DEV_OSST is not set
-# CONFIG_BLK_DEV_SR is not set
-CONFIG_CHR_DEV_SG=m
-# CONFIG_CHR_DEV_SCH is not set
-CONFIG_SCSI_MULTI_LUN=y
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_LOGGING=y
-# CONFIG_SCSI_SCAN_ASYNC is not set
-CONFIG_SCSI_WAIT_SCAN=m
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=y
-CONFIG_SCSI_FC_ATTRS=y
-CONFIG_SCSI_ISCSI_ATTRS=y
-CONFIG_SCSI_SAS_ATTRS=y
-CONFIG_SCSI_SAS_LIBSAS=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
-CONFIG_SCSI_SRP_ATTRS=m
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=m
-# CONFIG_LIBFC is not set
-# CONFIG_LIBFCOE is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_DH is not set
-# CONFIG_SCSI_OSD_INITIATOR is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_NETLINK is not set
 # CONFIG_ATA is not set
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=y
@@ -1274,11 +1238,9 @@ CONFIG_XEN_NETDEV_TX_SHIFT=8
 # CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set
 CONFIG_XEN_NETDEV_LOOPBACK=y
 # CONFIG_XEN_TPMDEV_BACKEND is not set
-CONFIG_XEN_SCSI_BACKEND=m
 CONFIG_XEN_BLKDEV_FRONTEND=y
 CONFIG_XEN_NETDEV_FRONTEND=y
 CONFIG_XEN_NETDEV_ACCEL_SFC_FRONTEND=m
-CONFIG_XEN_SCSI_FRONTEND=m
 # CONFIG_XEN_GRANT_DEV is not set
 CONFIG_XEN_FRAMEBUFFER=m
 CONFIG_XEN_KEYBOARD=m
diff --git a/sys-kernel/linux-xen-domU/files/linux-xen-domU-2.6.34-r4-x86.config b/sys-kernel/linux-xen-domU/files/linux-xen-domU-2.6.34-r4-x86.config
index 6dbd50dc7..b94c9c3df 100644
--- a/sys-kernel/linux-xen-domU/files/linux-xen-domU-2.6.34-r4-x86.config
+++ b/sys-kernel/linux-xen-domU/files/linux-xen-domU-2.6.34-r4-x86.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.34-xen-domU
-# Fri Jul 22 22:40:35 2011
+# Fri Jul 22 22:57:42 2011
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -821,7 +821,6 @@ CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_CRYPTOLOOP=y
 # CONFIG_BLK_DEV_DRBD is not set
 CONFIG_BLK_DEV_NBD=m
-# CONFIG_BLK_DEV_OSD is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=16384
@@ -844,55 +843,10 @@ CONFIG_HAVE_IDE=y
 # SCSI device support
 #
 CONFIG_SCSI_MOD=y
-CONFIG_RAID_ATTRS=y
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_TGT=m
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_ST=y
-CONFIG_CHR_DEV_OSST=y
-CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=y
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_CONSTANTS is not set
-CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_SCAN_ASYNC=y
-CONFIG_SCSI_WAIT_SCAN=m
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=y
-CONFIG_SCSI_FC_ATTRS=y
-CONFIG_SCSI_ISCSI_ATTRS=y
-CONFIG_SCSI_SAS_ATTRS=y
-CONFIG_SCSI_SAS_LIBSAS=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
-CONFIG_SCSI_SRP_ATTRS=m
-CONFIG_SCSI_SRP_TGT_ATTRS=y
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=y
-CONFIG_LIBFC=y
-CONFIG_LIBFCOE=y
-# CONFIG_SCSI_DEBUG is not set
-CONFIG_SCSI_DH=m
-CONFIG_SCSI_DH_RDAC=m
-CONFIG_SCSI_DH_HP_SW=m
-CONFIG_SCSI_DH_EMC=m
-CONFIG_SCSI_DH_ALUA=m
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
-CONFIG_SCSI_OSD_DPRINT_SENSE=1
-# CONFIG_SCSI_OSD_DEBUG is not set
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_NETLINK is not set
 # CONFIG_ATA is not set
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=y
@@ -1263,11 +1217,9 @@ CONFIG_XEN_NETDEV_TX_SHIFT=8
 # CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set
 CONFIG_XEN_NETDEV_LOOPBACK=y
 # CONFIG_XEN_TPMDEV_BACKEND is not set
-CONFIG_XEN_SCSI_BACKEND=m
 CONFIG_XEN_BLKDEV_FRONTEND=y
 CONFIG_XEN_NETDEV_FRONTEND=y
 CONFIG_XEN_NETDEV_ACCEL_SFC_FRONTEND=m
-CONFIG_XEN_SCSI_FRONTEND=m
 # CONFIG_XEN_GRANT_DEV is not set
 CONFIG_XEN_FRAMEBUFFER=m
 CONFIG_XEN_KEYBOARD=m
@@ -1435,7 +1387,6 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
 CONFIG_ROMFS_ON_BLOCK=y
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
-# CONFIG_EXOFS_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y