diff --git a/sys/arch/alpha/include/param.h b/sys/arch/alpha/include/param.h
index 10460e143a2c..73c09a51f811 100644
--- a/sys/arch/alpha/include/param.h
+++ b/sys/arch/alpha/include/param.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.11 1996/02/01 22:28:53 mycroft Exp $	*/
+/*	$NetBSD: param.h,v 1.12 1996/03/04 05:04:10 cgd Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -45,7 +45,9 @@
 /*
  * Machine dependent constants for the Alpha.
  */
+#define	_MACHINE	alpha
 #define	MACHINE		"alpha"
+#define	_MACHINE_ARCH	alpha
 #define	MACHINE_ARCH	"alpha"
 #define	MID_MACHINE	MID_ALPHA
 
diff --git a/sys/arch/amiga/include/param.h b/sys/arch/amiga/include/param.h
index a5e39fd5a9cb..58f861269b7e 100644
--- a/sys/arch/amiga/include/param.h
+++ b/sys/arch/amiga/include/param.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.27 1996/03/01 23:30:08 cgd Exp $	*/
+/*	$NetBSD: param.h,v 1.28 1996/03/04 05:04:14 cgd Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -47,7 +47,9 @@
 /*
  * Machine dependent constants for amiga
  */
+#define	_MACHINE	amiga
 #define	MACHINE		"amiga"
+#define	_MACHINE_ARCH	m68k
 #define	MACHINE_ARCH	"m68k"
 #define	MID_MACHINE	MID_M68K
 
diff --git a/sys/arch/arm32/include/param.h b/sys/arch/arm32/include/param.h
index 481556cc2b8f..8030397c6f7c 100644
--- a/sys/arch/arm32/include/param.h
+++ b/sys/arch/arm32/include/param.h
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.4 1996/03/01 23:30:15 cgd Exp $ */
+/* $NetBSD: param.h,v 1.5 1996/03/04 05:04:16 cgd Exp $ */
 
 /*
  * Copyright (c) 1994,1995 Mark Brinicombe.
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: param.h,v 1.4 1996/03/01 23:30:15 cgd Exp $
+ *	$Id: param.h,v 1.5 1996/03/04 05:04:16 cgd Exp $
  */
 
 #ifndef	_ARM32_PARAM_H_
@@ -46,7 +46,9 @@
  */
 /*#define	ovbcopy	bcopy	*/	/* XXX should probably have long gone by now */
 
+#define	_MACHINE	arm32
 #define	MACHINE		"arm32"
+#define	_MACHINE_ARCH	arm32
 #define	MACHINE_ARCH	"arm32"
 #define	MID_MACHINE	MID_ARM6
 
diff --git a/sys/arch/atari/include/param.h b/sys/arch/atari/include/param.h
index 515dc79a9ee1..05eb307c5502 100644
--- a/sys/arch/atari/include/param.h
+++ b/sys/arch/atari/include/param.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.12 1996/03/01 23:30:19 cgd Exp $	*/
+/*	$NetBSD: param.h,v 1.13 1996/03/04 05:04:20 cgd Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -48,7 +48,9 @@
 /*
  * Machine dependent constants for atari
  */
+#define	_MACHINE	atari
 #define	MACHINE		"atari"
+#define	_MACHINE_ARCH	m68k
 #define	MACHINE_ARCH	"m68k"
 #define	MID_MACHINE	MID_M68K
 
diff --git a/sys/arch/hp300/include/param.h b/sys/arch/hp300/include/param.h
index c73e3f827f29..48b9f6f997b0 100644
--- a/sys/arch/hp300/include/param.h
+++ b/sys/arch/hp300/include/param.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.24 1996/02/01 22:30:16 mycroft Exp $	*/
+/*	$NetBSD: param.h,v 1.25 1996/03/04 05:04:23 cgd Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -45,7 +45,9 @@
 /*
  * Machine dependent constants for HP9000 series 300.
  */
+#define	_MACHINE	hp300
 #define	MACHINE		"hp300"
+#define	_MACHINE_ARCH	m68k
 #define	MACHINE_ARCH	"m68k"
 #define	MID_MACHINE	MID_M68K4K
 
diff --git a/sys/arch/i386/include/param.h b/sys/arch/i386/include/param.h
index f41cc212b194..c9145acddc31 100644
--- a/sys/arch/i386/include/param.h
+++ b/sys/arch/i386/include/param.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.28 1996/03/01 23:30:24 cgd Exp $	*/
+/*	$NetBSD: param.h,v 1.29 1996/03/04 05:04:26 cgd Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -50,7 +50,9 @@
 #endif
 #endif
 
+#define	_MACHINE	i386
 #define	MACHINE		"i386"
+#define	_MACHINE_ARCH	i386
 #define	MACHINE_ARCH	"i386"
 #define	MID_MACHINE	MID_I386
 
diff --git a/sys/arch/mac68k/include/param.h b/sys/arch/mac68k/include/param.h
index 021eb051798e..e1b44f4126b6 100644
--- a/sys/arch/mac68k/include/param.h
+++ b/sys/arch/mac68k/include/param.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.24 1996/02/17 14:50:40 briggs Exp $	*/
+/*	$NetBSD: param.h,v 1.25 1996/03/04 05:04:29 cgd Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -86,7 +86,9 @@
 /*
  * Machine dependent constants for Macintosh II-and-similar series.
  */
+#define	_MACHINE	mac68k
 #define	MACHINE		"mac68k"
+#define	_MACHINE_ARCH	m68k
 #define	MACHINE_ARCH	"m68k"
 #define	MID_MACHINE	MID_M68K
 
diff --git a/sys/arch/mvme68k/include/param.h b/sys/arch/mvme68k/include/param.h
index fb41c1784f49..1186be9ab5b3 100644
--- a/sys/arch/mvme68k/include/param.h
+++ b/sys/arch/mvme68k/include/param.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.4 1996/03/01 23:30:34 cgd Exp $	*/
+/*	$NetBSD: param.h,v 1.5 1996/03/04 05:04:31 cgd Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -45,7 +45,9 @@
 /*
  * Machine dependent constants for mvme68k, based on HP9000 series 300.
  */
+#define	_MACHINE 	mvme68k
 #define	MACHINE		"mvme68k"
+#define	_MACHINE_ARCH	m68k
 #define	MACHINE_ARCH	"m68k"
 #define	MID_MACHINE	MID_M68K
 
diff --git a/sys/arch/pc532/include/param.h b/sys/arch/pc532/include/param.h
index f11cafa27060..774d46cab91c 100644
--- a/sys/arch/pc532/include/param.h
+++ b/sys/arch/pc532/include/param.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.14 1996/03/01 23:30:38 cgd Exp $	*/
+/*	$NetBSD: param.h,v 1.15 1996/03/04 05:04:34 cgd Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -52,7 +52,9 @@
 #include <machine/cpu.h>
 #endif
 
+#define	_MACHINE 	pc532
 #define	MACHINE		"pc532"
+#define	_MACHINE_ARCH	ns32k
 #define	MACHINE_ARCH	"ns32k"
 #define	MID_MACHINE	MID_NS32532
 
diff --git a/sys/arch/pmax/include/param.h b/sys/arch/pmax/include/param.h
index 9ac983404a63..c20124073479 100644
--- a/sys/arch/pmax/include/param.h
+++ b/sys/arch/pmax/include/param.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.14 1996/03/01 23:30:43 cgd Exp $	*/
+/*	$NetBSD: param.h,v 1.15 1996/03/04 05:04:36 cgd Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -45,7 +45,9 @@
 /*
  * Machine dependent constants for DEC Station 3100.
  */
+#define	_MACHINE	pmax
 #define	MACHINE		"pmax"
+#define	_MACHINE_ARCH	mips
 #define	MACHINE_ARCH	"mips"
 #define	MID_MACHINE	MID_PMAX
 
diff --git a/sys/arch/sparc/include/param.h b/sys/arch/sparc/include/param.h
index 8f7a58133ebc..b092b1ef78f2 100644
--- a/sys/arch/sparc/include/param.h
+++ b/sys/arch/sparc/include/param.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.21 1996/02/22 21:59:08 pk Exp $ */
+/*	$NetBSD: param.h,v 1.22 1996/03/04 05:04:38 cgd Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -47,7 +47,9 @@
 /*
  * Machine dependent constants for Sun-4c (SPARCstation)
  */
+#define	_MACHINE	sparc
 #define	MACHINE		"sparc"
+#define	_MACHINE_ARCH	sparc
 #define	MACHINE_ARCH	"sparc"
 #define	MID_MACHINE	MID_SPARC
 
diff --git a/sys/arch/sun3/include/param.h b/sys/arch/sun3/include/param.h
index b06b4da1e18a..befd54ed9186 100644
--- a/sys/arch/sun3/include/param.h
+++ b/sys/arch/sun3/include/param.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.33 1996/03/01 23:30:49 cgd Exp $	*/
+/*	$NetBSD: param.h,v 1.34 1996/03/04 05:04:40 cgd Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Gordon W. Ross
@@ -48,7 +48,9 @@
 /*
  * Machine dependent constants for the Sun3 series.
  */
+#define	_MACHINE	sun3
 #define	MACHINE		"sun3"
+#define	_MACHINE_ARCH	m68k
 #define	MACHINE_ARCH	"m68k"
 #define	MID_MACHINE	MID_M68K
 
diff --git a/sys/arch/sun3/include/param3.h b/sys/arch/sun3/include/param3.h
index 18aa294efc55..dc308ae4360d 100644
--- a/sys/arch/sun3/include/param3.h
+++ b/sys/arch/sun3/include/param3.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: param3.h,v 1.33 1996/03/01 23:30:49 cgd Exp $	*/
+/*	$NetBSD: param3.h,v 1.34 1996/03/04 05:04:40 cgd Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Gordon W. Ross
@@ -48,7 +48,9 @@
 /*
  * Machine dependent constants for the Sun3 series.
  */
+#define	_MACHINE	sun3
 #define	MACHINE		"sun3"
+#define	_MACHINE_ARCH	m68k
 #define	MACHINE_ARCH	"m68k"
 #define	MID_MACHINE	MID_M68K
 
diff --git a/sys/arch/vax/include/param.h b/sys/arch/vax/include/param.h
index 91f04c891cc6..ef969e37240e 100644
--- a/sys/arch/vax/include/param.h
+++ b/sys/arch/vax/include/param.h
@@ -1,4 +1,4 @@
-/*      $NetBSD: param.h,v 1.18 1996/03/02 14:27:55 ragge Exp $    */
+/*      $NetBSD: param.h,v 1.19 1996/03/04 05:04:43 cgd Exp $    */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -47,7 +47,9 @@
  * Machine dependent constants for VAX.
  */
 
+#define	_MACHINE	vax
 #define	MACHINE		"vax"
+#define	_MACHINE_ARCH	vax
 #define	MACHINE_ARCH	"vax"
 #define	MID_MACHINE	MID_VAX