diff --git a/sys/arch/vax/include/aout_machdep.h b/sys/arch/vax/include/aout_machdep.h
index 3d34ccc79e57..6515bc2f0b8d 100644
--- a/sys/arch/vax/include/aout_machdep.h
+++ b/sys/arch/vax/include/aout_machdep.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: aout_machdep.h,v 1.4 1995/09/23 14:57:40 ragge Exp $	*/
+/*	$NetBSD: aout_machdep.h,v 1.5 1998/08/21 13:42:52 ragge Exp $	*/
 
 /*
  * Copyright (c) 1993 Christopher G. Demetriou
@@ -30,7 +30,7 @@
 #ifndef _VAX_EXEC_H_
 #define _VAX_EXEC_H_
 
-#define __LDPGSZ	1024
+#define __LDPGSZ	4096
 
 /* Relocation format. */
 struct relocation_info_vax {
diff --git a/sys/arch/vax/include/param.h b/sys/arch/vax/include/param.h
index afe8d53acad8..d1faa236dc50 100644
--- a/sys/arch/vax/include/param.h
+++ b/sys/arch/vax/include/param.h
@@ -1,4 +1,4 @@
-/*      $NetBSD: param.h,v 1.30 1998/06/20 18:47:33 ragge Exp $    */
+/*      $NetBSD: param.h,v 1.31 1998/08/21 13:42:52 ragge Exp $    */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -40,9 +40,6 @@
 #ifndef _VAX_PARAM_H_
 #define _VAX_PARAM_H_
 
-#include <machine/macros.h>
-#include <machine/psl.h>
-
 /*
  * Machine dependent constants for VAX.
  */
@@ -84,8 +81,8 @@
 #define	MAXPHYS		(63 * 1024)	/* max raw I/O transfer size */
 #define	MAXBSIZE	0x4000		/* max FS block size - XXX */
 
-#define	CLSIZELOG2    1
-#define	CLSIZE	      2
+#define	CLSIZELOG2    3
+#define	CLSIZE	      8
 
 /* NOTE: SSIZE, SINCR and UPAGES must be multiples of CLSIZE */
 #define	SSIZE	4		/* initial stack size/NBPG */
@@ -95,7 +92,7 @@
 #define USPACE  (NBPG*UPAGES)
 
 #ifndef MSGBUFSIZE
-#define MSGBUFSIZE	(CLBYTES * 4)	/* default message buffer size */
+#define MSGBUFSIZE	CLBYTES		/* default message buffer size */
 #endif
 
 /*
@@ -191,7 +188,7 @@
 #define	spl6()		splx(0x16)
 #define	spl7()		splx(0x17)
 
-#define	ovbcopy(x,y,z)	bcopy(x,y,z)
+/* #define	ovbcopy(x,y,z)	bcopy(x,y,z) */
 
 #if !defined(VAX410) && !defined(VAX43)
 #define vmapbuf(p,q)
@@ -202,6 +199,8 @@
 /* Prototype needed for delay() */
 #ifndef	_LOCORE
 void	delay __P((int));
+/* inline macros used inside kernel */
+#include <machine/macros.h>
 #endif
 
 #define	DELAY(x) delay(x)
diff --git a/sys/arch/vax/include/pmap.h b/sys/arch/vax/include/pmap.h
index 4f8c24e7f146..613287ebee33 100644
--- a/sys/arch/vax/include/pmap.h
+++ b/sys/arch/vax/include/pmap.h
@@ -1,4 +1,4 @@
-/*      $NetBSD: pmap.h,v 1.27 1998/05/03 13:02:22 ragge Exp $     */
+/*      $NetBSD: pmap.h,v 1.28 1998/08/21 13:42:52 ragge Exp $     */
 
 /* 
  * Copyright (c) 1987 Carnegie-Mellon University
@@ -112,11 +112,11 @@ extern	struct pmap kernel_pmap_store;
 /* These can be done as efficient inline macros */
 #define pmap_copy_page(src, dst)				\
 	__asm__("addl3 $0x80000000,%0,r0;addl3 $0x80000000,%1,r1;	\
-	    movc3 $1024,(r0),(r1)"				\
+	    movc3 $4096,(r0),(r1)"				\
 	    :: "r"(src),"r"(dst):"r0","r1","r2","r3","r4","r5");
 
 #define pmap_zero_page(phys)					\
-	__asm__("addl3 $0x80000000,%0,r0;movc5 $0,(r0),$0,$1024,(r0)" \
+	__asm__("addl3 $0x80000000,%0,r0;movc5 $0,(r0),$0,$4096,(r0)" \
 	    :: "r"(phys): "r0","r1","r2","r3","r4","r5");
 
 /* Prototypes */
diff --git a/sys/arch/vax/include/vmparam.h b/sys/arch/vax/include/vmparam.h
index 51ed321ff388..ae7a1498ddb6 100644
--- a/sys/arch/vax/include/vmparam.h
+++ b/sys/arch/vax/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.18 1998/07/08 04:43:22 thorpej Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.19 1998/08/21 13:42:51 ragge Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -54,7 +54,7 @@
  *
  */
 
-#define USRTEXT		0x400
+#define USRTEXT		0x1000
 #define USRSTACK	KERNBASE
 
 /*
diff --git a/sys/kern/exec_conf.c b/sys/kern/exec_conf.c
index ff042dba611d..488c4f8964a2 100644
--- a/sys/kern/exec_conf.c
+++ b/sys/kern/exec_conf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: exec_conf.c,v 1.28 1998/07/31 22:50:48 perry Exp $	*/
+/*	$NetBSD: exec_conf.c,v 1.29 1998/08/21 13:41:09 ragge Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994 Christopher G. Demetriou
@@ -85,6 +85,10 @@
 #include <compat/m68k4k/m68k4k_exec.h>
 #endif
 
+#ifdef COMPAT_VAX1K
+#include <compat/vax1k/vax1k_exec.h>
+#endif
+
 struct execsw execsw[] = {
 #ifdef LKM
 	{ 0, NULL, },					/* entries for LKMs */
@@ -127,6 +131,9 @@ struct execsw execsw[] = {
 #ifdef COMPAT_M68K4K
 	{ sizeof(struct exec), exec_m68k4k_makecmds, },	/* m68k4k a.out */
 #endif
+#ifdef COMPAT_VAX1K
+	{ sizeof(struct exec), exec_vax1k_makecmds, },	/* vax1k a.out */
+#endif
 };
 int nexecs = (sizeof(execsw) / sizeof(*execsw));
 int exec_maxhdrsz;
diff --git a/sys/sys/exec_aout.h b/sys/sys/exec_aout.h
index 4622320e5914..bf7b7b59596d 100644
--- a/sys/sys/exec_aout.h
+++ b/sys/sys/exec_aout.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: exec_aout.h,v 1.18 1997/01/22 07:09:14 mikel Exp $	*/
+/*	$NetBSD: exec_aout.h,v 1.19 1998/08/21 13:41:10 ragge Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994 Christopher G. Demetriou
@@ -74,11 +74,12 @@ struct exec {
 #define	MID_NS32532	137	/* ns32532 */
 #define	MID_SPARC	138	/* sparc */
 #define	MID_PMAX	139	/* pmax */
-#define	MID_VAX		140	/* vax */
+#define	MID_VAX1K	140	/* vax 1K page size binaries */
 #define	MID_ALPHA	141	/* Alpha BSD binary */
 #define	MID_MIPS	142	/* big-endian MIPS */
 #define	MID_ARM6	143	/* ARM6 */
 #define	MID_POWERPC	149	/* big-endian PowerPC */
+#define	MID_VAX		150	/* vax */
 #define	MID_HP300	300	/* hp300 (68020+68881) BSD binary */
 #define	MID_HPUX	0x20C	/* hp200/300 HP-UX binary */
 #define	MID_HPUX800     0x20B   /* hp800 HP-UX binary */