diff --git a/sys/arch/hp300/conf/DISKLESS b/sys/arch/hp300/conf/DISKLESS
index 9cf99db4432f..6dad7b47996a 100644
--- a/sys/arch/hp300/conf/DISKLESS
+++ b/sys/arch/hp300/conf/DISKLESS
@@ -1,4 +1,4 @@
-#	$NetBSD: DISKLESS,v 1.16 1997/03/31 00:03:11 thorpej Exp $
+#	$NetBSD: DISKLESS,v 1.17 1997/04/27 21:06:29 thorpej Exp $
 #
 # Diskless HP 9000/300-series workstation
 #
@@ -10,11 +10,15 @@ include "arch/hp300/conf/std.hp300"
 options 	HP320
 options 	HP330		# includes 318, 319
 options 	HP340
+options 	HP345
 options 	HP350
 options 	HP360
 options 	HP370
-options 	HP375		# includes 345, 400t, 400s
-options 	HP380		# includes 425t, 425s, 433s
+options 	HP375
+options 	HP380
+options 	HP400
+options 	HP425
+options 	HP433
 
 # Need to set locally
 maxusers	8
diff --git a/sys/arch/hp300/conf/DUALITY b/sys/arch/hp300/conf/DUALITY
index bf9042a3ddbb..b61c56c23c91 100644
--- a/sys/arch/hp300/conf/DUALITY
+++ b/sys/arch/hp300/conf/DUALITY
@@ -1,4 +1,4 @@
-#	$NetBSD: DUALITY,v 1.27 1997/03/14 04:21:13 mycroft Exp $
+#	$NetBSD: DUALITY,v 1.28 1997/04/27 21:06:29 thorpej Exp $
 #
 # Generic kernel - one size fits all.
 #
@@ -10,11 +10,15 @@ include "arch/hp300/conf/std.hp300"
 #options 	HP320
 #options 	HP330		# includes 318, 319
 #options 	HP340
+#options 	HP345
 #options 	HP350
 #options 	HP360
 #options 	HP370
-#options 	HP375		# includes 345, 400t, 400s
-options 	HP380		# includes 425t, 425s, 433s
+#options 	HP375
+options 	HP380
+#options 	HP400
+#options 	HP425
+#options 	HP433
 
 # Need to set locally
 maxusers	16
diff --git a/sys/arch/hp300/conf/GENERIC b/sys/arch/hp300/conf/GENERIC
index a6e87b568cf1..443b7e55f13d 100644
--- a/sys/arch/hp300/conf/GENERIC
+++ b/sys/arch/hp300/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.27 1997/03/31 00:03:11 thorpej Exp $
+#	$NetBSD: GENERIC,v 1.28 1997/04/27 21:06:30 thorpej Exp $
 #
 # Generic kernel - one size fits all.
 #
@@ -10,11 +10,15 @@ include "arch/hp300/conf/std.hp300"
 options 	HP320
 options 	HP330		# includes 318, 319
 options 	HP340
+options 	HP345
 options 	HP350
 options 	HP360
 options 	HP370
-options 	HP375		# includes 345, 400t, 400s
-options 	HP380		# includes 425t, 425s, 433s
+options 	HP375
+options 	HP380
+options 	HP400
+options 	HP425
+options 	HP433
 
 # Need to set locally
 maxusers	32