diff --git a/lib/libkvm/kvm_proc.c b/lib/libkvm/kvm_proc.c
index 7e3dcf04de01..ac984d458782 100644
--- a/lib/libkvm/kvm_proc.c
+++ b/lib/libkvm/kvm_proc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kvm_proc.c,v 1.58 2004/05/12 17:20:01 toshii Exp $	*/
+/*	$NetBSD: kvm_proc.c,v 1.59 2005/05/11 17:41:52 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
 #if 0
 static char sccsid[] = "@(#)kvm_proc.c	8.3 (Berkeley) 9/23/93";
 #else
-__RCSID("$NetBSD: kvm_proc.c,v 1.58 2004/05/12 17:20:01 toshii Exp $");
+__RCSID("$NetBSD: kvm_proc.c,v 1.59 2005/05/11 17:41:52 jmc Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -242,7 +242,7 @@ _kvm_ureadm(kd, p, va, cnt)
 	if (KREAD(kd, addr, &anon))
 		return (NULL);
 
-	addr = (u_long)anon.u.an_page;
+	addr = (u_long)anon.an_page;
 	if (addr) {
 		if (KREAD(kd, addr, &pg))
 			return (NULL);
diff --git a/usr.bin/pmap/pmap.c b/usr.bin/pmap/pmap.c
index 39ced806c3e3..e1c66efd754a 100644
--- a/usr.bin/pmap/pmap.c
+++ b/usr.bin/pmap/pmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.25 2005/02/11 02:12:03 chs Exp $ */
+/*	$NetBSD: pmap.c,v 1.26 2005/05/11 17:41:52 jmc Exp $ */
 
 /*
  * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: pmap.c,v 1.25 2005/02/11 02:12:03 chs Exp $");
+__RCSID("$NetBSD: pmap.c,v 1.26 2005/05/11 17:41:52 jmc Exp $");
 #endif
 
 #include <string.h>
@@ -690,8 +690,8 @@ dump_vm_anon(kvm_t *kd, struct vm_anon **alist, int i)
 		else
 			KDEREF(kd, anon);
 
-		printf(" = { an_ref = %d, an_lock = <struct simplelock>, an_nxt/an_page = %p, an_swslot = %d }",
-		       D(anon, anon)->an_ref, D(anon, anon)->u.an_nxt, D(anon, anon)->an_swslot);
+		printf(" = { an_ref = %d, an_lock = <struct simplelock>, an_page = %p, an_swslot = %d }",
+		       D(anon, anon)->an_ref, D(anon, anon)->an_page, D(anon, anon)->an_swslot);
 	}
 
 	printf("\n");