diff --git a/sys/arch/evbppc/conf/EV64260 b/sys/arch/evbppc/conf/EV64260
index 859cf5e57ab7..c611be6732a3 100644
--- a/sys/arch/evbppc/conf/EV64260
+++ b/sys/arch/evbppc/conf/EV64260
@@ -1,4 +1,4 @@
-#	$NetBSD: EV64260,v 1.7 2003/09/25 18:57:55 matt Exp $
+#	$NetBSD: EV64260,v 1.8 2003/10/08 11:08:07 bouyer Exp $
 #
 #	MVP -- Motorola's Multiprocessing Verification Platform
 #
@@ -226,7 +226,8 @@ cd*		at scsibus? target ? lun ?
 #audio*	at auvia?
 
 pciide*		at pci? dev ? function ? flags 0x0000
-wd*		at pciide? channel ? drive ? flags 0x0000
+atabus* 	at pciide? channel ?
+wd*		at atabus? drive ? flags 0x0000
 
 #pseudo-device	vnd		4	# disk-like interface to files
 #pseudo-device	ccd		4	# concatenated/striped disk devices
diff --git a/sys/arch/evbppc/conf/OPENBLOCKS266 b/sys/arch/evbppc/conf/OPENBLOCKS266
index cdbdb863b9cc..f91df0e4a6fe 100644
--- a/sys/arch/evbppc/conf/OPENBLOCKS266
+++ b/sys/arch/evbppc/conf/OPENBLOCKS266
@@ -1,4 +1,4 @@
-#	$NetBSD: OPENBLOCKS266,v 1.3 2003/10/06 18:20:54 shige Exp $
+#	$NetBSD: OPENBLOCKS266,v 1.4 2003/10/08 11:08:07 bouyer Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -151,6 +151,7 @@ pchb0	at plb?				# PCI-Host bridges
 pci*	at pchb?
 ppb*	at pci? dev ? function ?	# PCI-PCI bridges
 pciide*	at pci? dev ? function ?
+atabus* at pciide? channel ?
 
 tlp*	at pci? dev ? function ?	# DECchip 21x4x and clones
 
@@ -170,9 +171,9 @@ ukphy*	at mii? phy ?			# generic unknown PHYs
 #tlp*	at cardbus? dev ? function ?	# DECchip 21143
 #rtk*	at cardbus? dev ? function ?	# Realtek 8129/8139
 
-wd*	at pciide? channel ? drive ?
+wd*	at atabus? drive ?
 
-atapibus* at pciide? channel ?
+atapibus* at atabus?
 
 cd*	at atapibus? drive ? flags 0x0000	# ATAPI CD-ROM drives
 sd*	at atapibus? drive ? flags 0x0000	# ATAPI disk drives
diff --git a/sys/arch/evbppc/conf/WALNUT b/sys/arch/evbppc/conf/WALNUT
index a9a42693a6cc..715e63e7626a 100644
--- a/sys/arch/evbppc/conf/WALNUT
+++ b/sys/arch/evbppc/conf/WALNUT
@@ -1,4 +1,4 @@
-#	$NetBSD: WALNUT,v 1.6 2003/10/06 16:04:15 scw Exp $
+#	$NetBSD: WALNUT,v 1.7 2003/10/08 11:08:07 bouyer Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -211,9 +211,10 @@ ch*	at scsibus? target ? lun ?	# SCSI autochangers
 ss*	at scsibus? target ? lun ?	# SCSI scanners
 uk*	at scsibus? target ? lun ?	# SCSI unknown
 
-wd*	at pciide? channel ? drive ?
+atabus* 	at pciide? channel ?
+wd*		at atabus? drive ? flags 0x0000
 
-atapibus* at pciide? channel ?
+atapibus* at atabus?
 
 cd*	at atapibus? drive ? flags 0x0000	# ATAPI CD-ROM drives
 sd*	at atapibus? drive ? flags 0x0000	# ATAPI disk drives
diff --git a/sys/arch/hpcarm/conf/IPAQ b/sys/arch/hpcarm/conf/IPAQ
index e17b3c2e5599..9ba8b1e0ddd1 100644
--- a/sys/arch/hpcarm/conf/IPAQ
+++ b/sys/arch/hpcarm/conf/IPAQ
@@ -1,4 +1,4 @@
-#	$NetBSD: IPAQ,v 1.25 2003/09/13 13:30:03 chris Exp $
+#	$NetBSD: IPAQ,v 1.26 2003/10/08 11:08:54 bouyer Exp $
 #
 #	iPAQ H3600 -- Windows-CE based PDA
 #
@@ -151,7 +151,8 @@ com*	at pcmcia? function ?		# Modems and serial cards
 
 # PCMCIA IDE controllers and disks
 wdc*	at pcmcia? function ?
-wd*	at wdc?
+atabus* at wdc? channel ?
+wd*	at atabus? drive ?
 
 # PCMCIA network interfaces
 an*	at pcmcia? function ?		# Aironet PC4500/PC4800 (802.11)
diff --git a/sys/arch/hpcarm/conf/JORNADA720 b/sys/arch/hpcarm/conf/JORNADA720
index 6632aba5b4c4..82d371f52941 100644
--- a/sys/arch/hpcarm/conf/JORNADA720
+++ b/sys/arch/hpcarm/conf/JORNADA720
@@ -1,4 +1,4 @@
-#	$NetBSD: JORNADA720,v 1.31 2003/09/13 13:30:03 chris Exp $
+#	$NetBSD: JORNADA720,v 1.32 2003/10/08 11:08:54 bouyer Exp $
 #
 #	JORNADA -- Windows-CE based jornada 720
 #
@@ -7,7 +7,7 @@ include	"arch/hpcarm/conf/std.hpcarm"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.31 $"
+#ident 		"GENERIC-$Revision: 1.32 $"
 
 # estimated number of users
 maxusers	32
@@ -151,7 +151,8 @@ com*	at pcmcia? function ?		# Modems and serial cards
 
 # PCMCIA IDE controllers and disks
 wdc*	at pcmcia? function ?
-wd*	at wdc?
+atabus* at wdc? channel ?
+wd*	at atabus? drive ?
 
 # PCMCIA network interfaces
 an*	at pcmcia? function ?		# Aironet PC4500/PC4800 (802.11)
diff --git a/sys/arch/hpcarm/conf/JORNADA728 b/sys/arch/hpcarm/conf/JORNADA728
index 3acd057530be..dc74090ec716 100644
--- a/sys/arch/hpcarm/conf/JORNADA728
+++ b/sys/arch/hpcarm/conf/JORNADA728
@@ -1,4 +1,4 @@
-#	$NetBSD: JORNADA728,v 1.2 2003/09/16 21:56:00 agc Exp $
+#	$NetBSD: JORNADA728,v 1.3 2003/10/08 11:08:54 bouyer Exp $
 #
 #	JORNADA -- Windows-CE based jornada 728
 #
@@ -7,7 +7,7 @@ include	"arch/hpcarm/conf/std.hpcarm"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.2 $"
+#ident 		"GENERIC-$Revision: 1.3 $"
 
 # estimated number of users
 maxusers	32
@@ -155,7 +155,8 @@ com*	at pcmcia? function ?		# Modems and serial cards
 
 # PCMCIA IDE controllers and disks
 wdc*	at pcmcia? function ?
-wd*	at wdc?
+atabus* at wdc? channel ?
+wd*	at atabus? drive ?
 
 # PCMCIA network interfaces
 an*	at pcmcia? function ?		# Aironet PC4500/PC4800 (802.11)