diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h
index 8acd6b818094..79350a582868 100644
--- a/sys/amd64/include/pmap.h
+++ b/sys/amd64/include/pmap.h
@@ -42,7 +42,7 @@
  *
  *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
- * 	$Id: pmap.h,v 1.57 1998/11/24 20:25:52 eivind Exp $
+ * 	$Id: pmap.h,v 1.58 1999/03/02 16:20:39 dg Exp $
  */
 
 #ifndef _MACHINE_PMAP_H_
@@ -88,13 +88,13 @@
 #define VADDR(pdi, pti) ((vm_offset_t)(((pdi)<<PDRSHIFT)|((pti)<<PAGE_SHIFT)))
 
 #ifndef NKPT
-#define	NKPT			9	/* actual number of kernel page tables */
+#define	NKPT			17	/* actual number of kernel page tables */
 #endif
 #ifndef NKPDE
 #ifdef SMP
-#define NKPDE			62	/* addressable number of page tables/pde's */
+#define NKPDE			254	/* addressable number of page tables/pde's */
 #else
-#define NKPDE			63	/* addressable number of page tables/pde's */
+#define NKPDE			255	/* addressable number of page tables/pde's */
 #endif	/* SMP */
 #endif
 
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index d2cbba1d2f13..36b97907a87c 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -1,7 +1,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.139 1999/02/14 13:56:15 des Exp $
+#	$Id: Makefile.i386,v 1.140 1999/03/01 09:54:51 dt Exp $
 #
 # Makefile for FreeBSD
 #
@@ -56,7 +56,7 @@ CFLAGS+=	-elf
 CFLAGS+=	-aout
 .endif
 
-LOAD_ADDRESS?=	F0100000
+LOAD_ADDRESS?=	C0100000
 DEFINED_PROF=	${PROF}
 .if defined(PROF)
 CFLAGS+=	-malign-functions=4
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index d2cbba1d2f13..36b97907a87c 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -1,7 +1,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.139 1999/02/14 13:56:15 des Exp $
+#	$Id: Makefile.i386,v 1.140 1999/03/01 09:54:51 dt Exp $
 #
 # Makefile for FreeBSD
 #
@@ -56,7 +56,7 @@ CFLAGS+=	-elf
 CFLAGS+=	-aout
 .endif
 
-LOAD_ADDRESS?=	F0100000
+LOAD_ADDRESS?=	C0100000
 DEFINED_PROF=	${PROF}
 .if defined(PROF)
 CFLAGS+=	-malign-functions=4
diff --git a/sys/conf/ldscript.amd64 b/sys/conf/ldscript.amd64
index e5d3b9069efc..89573fe31000 100644
--- a/sys/conf/ldscript.amd64
+++ b/sys/conf/ldscript.amd64
@@ -5,7 +5,7 @@ SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/obj/elf/home/src/tmp/usr/i386-unknown-free
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
-  . = 0xf0100000 + SIZEOF_HEADERS;
+  . = 0xc0100000 + SIZEOF_HEADERS;
   .interp     : { *(.interp) 	}
   .hash          : { *(.hash)		}
   .dynsym        : { *(.dynsym)		}
diff --git a/sys/conf/ldscript.i386 b/sys/conf/ldscript.i386
index e5d3b9069efc..89573fe31000 100644
--- a/sys/conf/ldscript.i386
+++ b/sys/conf/ldscript.i386
@@ -5,7 +5,7 @@ SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/obj/elf/home/src/tmp/usr/i386-unknown-free
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
-  . = 0xf0100000 + SIZEOF_HEADERS;
+  . = 0xc0100000 + SIZEOF_HEADERS;
   .interp     : { *(.interp) 	}
   .hash          : { *(.hash)		}
   .dynsym        : { *(.dynsym)		}
diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386
index d2cbba1d2f13..36b97907a87c 100644
--- a/sys/i386/conf/Makefile.i386
+++ b/sys/i386/conf/Makefile.i386
@@ -1,7 +1,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.139 1999/02/14 13:56:15 des Exp $
+#	$Id: Makefile.i386,v 1.140 1999/03/01 09:54:51 dt Exp $
 #
 # Makefile for FreeBSD
 #
@@ -56,7 +56,7 @@ CFLAGS+=	-elf
 CFLAGS+=	-aout
 .endif
 
-LOAD_ADDRESS?=	F0100000
+LOAD_ADDRESS?=	C0100000
 DEFINED_PROF=	${PROF}
 .if defined(PROF)
 CFLAGS+=	-malign-functions=4
diff --git a/sys/i386/conf/kernel.script b/sys/i386/conf/kernel.script
index e5d3b9069efc..89573fe31000 100644
--- a/sys/i386/conf/kernel.script
+++ b/sys/i386/conf/kernel.script
@@ -5,7 +5,7 @@ SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/obj/elf/home/src/tmp/usr/i386-unknown-free
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
-  . = 0xf0100000 + SIZEOF_HEADERS;
+  . = 0xc0100000 + SIZEOF_HEADERS;
   .interp     : { *(.interp) 	}
   .hash          : { *(.hash)		}
   .dynsym        : { *(.dynsym)		}
diff --git a/sys/i386/include/pmap.h b/sys/i386/include/pmap.h
index 8acd6b818094..79350a582868 100644
--- a/sys/i386/include/pmap.h
+++ b/sys/i386/include/pmap.h
@@ -42,7 +42,7 @@
  *
  *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
- * 	$Id: pmap.h,v 1.57 1998/11/24 20:25:52 eivind Exp $
+ * 	$Id: pmap.h,v 1.58 1999/03/02 16:20:39 dg Exp $
  */
 
 #ifndef _MACHINE_PMAP_H_
@@ -88,13 +88,13 @@
 #define VADDR(pdi, pti) ((vm_offset_t)(((pdi)<<PDRSHIFT)|((pti)<<PAGE_SHIFT)))
 
 #ifndef NKPT
-#define	NKPT			9	/* actual number of kernel page tables */
+#define	NKPT			17	/* actual number of kernel page tables */
 #endif
 #ifndef NKPDE
 #ifdef SMP
-#define NKPDE			62	/* addressable number of page tables/pde's */
+#define NKPDE			254	/* addressable number of page tables/pde's */
 #else
-#define NKPDE			63	/* addressable number of page tables/pde's */
+#define NKPDE			255	/* addressable number of page tables/pde's */
 #endif	/* SMP */
 #endif