diff --git a/distrib/amd64/ramdisks/ramdisk/Makefile b/distrib/amd64/ramdisks/ramdisk/Makefile
index 515201479f05..6db05aac9206 100644
--- a/distrib/amd64/ramdisks/ramdisk/Makefile
+++ b/distrib/amd64/ramdisks/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2009/09/20 22:46:11 abs Exp $
+#	$NetBSD: Makefile,v 1.4 2009/09/20 22:50:50 abs Exp $
 
 IMAGE=		ramdisk.fs
 IMAGESIZE=	5000k
@@ -9,5 +9,5 @@ SMALLPROG_INET6=1
 .include "${.CURDIR}/../common/Makefile.ramdisk"
 
 .if ${USE_INET6} != "no"
-LISTS+=		${.CURDIR}/list.inet6
+LISTS+=		${DISTRIBDIR}/common/list.inet6
 .endif
diff --git a/distrib/amd64/ramdisks/ramdisk/list.inet6 b/distrib/amd64/ramdisks/ramdisk/list.inet6
deleted file mode 100644
index 632999c11cc5..000000000000
--- a/distrib/amd64/ramdisks/ramdisk/list.inet6
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$NetBSD: list.inet6,v 1.1 2006/06/02 22:11:52 hubertf Exp $
-
-PROG	sbin/ping6
-PROG	sbin/rtsol
-
-SPECIAL	ping6		srcdir	distrib/utils/x_ping6
diff --git a/distrib/cats/ramdisk/Makefile b/distrib/cats/ramdisk/Makefile
index 459d462eaed6..51ba7d4f6d4e 100644
--- a/distrib/cats/ramdisk/Makefile
+++ b/distrib/cats/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2009/09/20 22:46:11 abs Exp $
+#	$NetBSD: Makefile,v 1.17 2009/09/20 22:50:50 abs Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -22,7 +22,7 @@ IMAGEDEPENDS=	${CRUNCHBIN} \
 		${NETBSDSRCDIR}/distrib/common/termcap.mini
 
 .if ${USE_INET6} != "no"
-LISTS+=		${.CURDIR}/list.inet6
+LISTS+=		${DISTRIBDIR}/common/list.inet6
 .endif
 
 # Use stubs to eliminate some large stuff from libc
diff --git a/distrib/cats/ramdisk/list.inet6 b/distrib/cats/ramdisk/list.inet6
deleted file mode 100644
index 24832a83b7a9..000000000000
--- a/distrib/cats/ramdisk/list.inet6
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$NetBSD: list.inet6,v 1.2 2005/12/04 21:32:11 dsl Exp $
-
-PROG	sbin/ping6
-PROG	sbin/rtsol
-
-SPECIAL	ping6		srcdir	distrib/utils/x_ping6
diff --git a/distrib/ibmnws/netboot/ramdisk/list.inet6 b/distrib/common/list.inet6
similarity index 57%
rename from distrib/ibmnws/netboot/ramdisk/list.inet6
rename to distrib/common/list.inet6
index 24832a83b7a9..8624e3ef5e02 100644
--- a/distrib/ibmnws/netboot/ramdisk/list.inet6
+++ b/distrib/common/list.inet6
@@ -1,4 +1,4 @@
-#	$NetBSD: list.inet6,v 1.2 2005/12/04 21:32:11 dsl Exp $
+#	$NetBSD: list.inet6,v 1.1 2009/09/20 22:50:50 abs Exp $
 
 PROG	sbin/ping6
 PROG	sbin/rtsol
diff --git a/distrib/hp700/ramdisk/Makefile b/distrib/hp700/ramdisk/Makefile
index ac6208c0c246..561b68de6abe 100644
--- a/distrib/hp700/ramdisk/Makefile
+++ b/distrib/hp700/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2009/09/20 19:49:08 abs Exp $
+#	$NetBSD: Makefile,v 1.7 2009/09/20 22:50:50 abs Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -24,7 +24,7 @@ IMAGEDEPENDS=	${CRUNCHBIN} \
 SMALLPROG_INET6=1
 
 .if ${USE_INET6} != "no"
-LISTS+=		${.CURDIR}/list.inet6
+LISTS+=		${DISTRIBDIR}/common/list.inet6
 .endif
 
 # Use stubs to eliminate some large stuff from libc
diff --git a/distrib/hp700/ramdisk/list.inet6 b/distrib/hp700/ramdisk/list.inet6
deleted file mode 100644
index 68d095c82c83..000000000000
--- a/distrib/hp700/ramdisk/list.inet6
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$NetBSD: list.inet6,v 1.1 2005/05/18 14:04:26 chs Exp $
-
-PROG	sbin/ping6
-PROG	sbin/rtsol
-
-SPECIAL	ping6		srcdir	distrib/utils/x_ping6
diff --git a/distrib/i386/ramdisks/ramdisk-big/Makefile b/distrib/i386/ramdisks/ramdisk-big/Makefile
index 4ef01e09bcaf..5874ad84ad78 100644
--- a/distrib/i386/ramdisks/ramdisk-big/Makefile
+++ b/distrib/i386/ramdisks/ramdisk-big/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2009/09/20 22:46:12 abs Exp $
+#	$NetBSD: Makefile,v 1.4 2009/09/20 22:50:50 abs Exp $
 
 BOOTMODEL=	big
 IMAGE=		ramdisk-${BOOTMODEL}.fs
@@ -11,7 +11,7 @@ SMALLPROG_INET6=1
 .include "${DISTRIBDIR}/common/Makefile.dhcpcd"
 
 .if ${USE_INET6} != "no"
-LISTS+=		${.CURDIR}/list.inet6
+LISTS+=		${DISTRIBDIR}/common/list.inet6
 .endif
 
 MAKEFS_FLAGS+=	-f 20
diff --git a/distrib/i386/ramdisks/ramdisk-big/list.inet6 b/distrib/i386/ramdisks/ramdisk-big/list.inet6
deleted file mode 100644
index 19c86d5ca4e4..000000000000
--- a/distrib/i386/ramdisks/ramdisk-big/list.inet6
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$NetBSD: list.inet6,v 1.1 2006/06/02 22:11:42 hubertf Exp $
-
-PROG	sbin/ping6
-PROG	sbin/rtsol
-
-SPECIAL	ping6		srcdir	distrib/utils/x_ping6
diff --git a/distrib/ibmnws/netboot/ramdisk/Makefile b/distrib/ibmnws/netboot/ramdisk/Makefile
index 5b65f6cc5fc7..6ea43789a6c4 100644
--- a/distrib/ibmnws/netboot/ramdisk/Makefile
+++ b/distrib/ibmnws/netboot/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2009/09/20 19:49:08 abs Exp $
+#	$NetBSD: Makefile,v 1.6 2009/09/20 22:50:50 abs Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -24,7 +24,7 @@ IMAGEDEPENDS=	${CRUNCHBIN} \
 SMALLPROG_INET6=1
 
 .if ${USE_INET6} != "no"
-LISTS+=		${.CURDIR}/list.inet6
+LISTS+=		${DISTRIBDIR}/common/list.inet6
 .endif
 
 # Use stubs to eliminate some large stuff from libc
diff --git a/distrib/macppc/floppies/ramdisk/Makefile b/distrib/macppc/floppies/ramdisk/Makefile
index c9ee7076d574..221bea2ef898 100644
--- a/distrib/macppc/floppies/ramdisk/Makefile
+++ b/distrib/macppc/floppies/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.34 2009/09/20 19:49:09 abs Exp $
+#	$NetBSD: Makefile,v 1.35 2009/09/20 22:50:50 abs Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -25,7 +25,7 @@ IMAGEDEPENDS=	${CRUNCHBIN} \
 SMALLPROG_INET6=1
 
 .if ${USE_INET6} != "no"
-LISTS+=		${.CURDIR}/list.inet6
+LISTS+=		${DISTRIBDIR}/common/list.inet6
 .endif
 
 # Use stubs to eliminate some large stuff from libc
diff --git a/distrib/macppc/floppies/ramdisk/list.inet6 b/distrib/macppc/floppies/ramdisk/list.inet6
deleted file mode 100644
index 24832a83b7a9..000000000000
--- a/distrib/macppc/floppies/ramdisk/list.inet6
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$NetBSD: list.inet6,v 1.2 2005/12/04 21:32:11 dsl Exp $
-
-PROG	sbin/ping6
-PROG	sbin/rtsol
-
-SPECIAL	ping6		srcdir	distrib/utils/x_ping6
diff --git a/distrib/ofppc/ramdisks/ramdisk/Makefile b/distrib/ofppc/ramdisks/ramdisk/Makefile
index d9190fedc54f..ec6d3a39b952 100644
--- a/distrib/ofppc/ramdisks/ramdisk/Makefile
+++ b/distrib/ofppc/ramdisks/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2009/04/07 11:49:18 joerg Exp $
+#	$NetBSD: Makefile,v 1.3 2009/09/20 22:50:51 abs Exp $
 
 IMAGE=		ramdisk.fs
 IMAGESIZE=	5000k
@@ -8,5 +8,5 @@ SMALLPROG_INET6=1
 .include "${.CURDIR}/../common/Makefile.ramdisk"
 
 .if ${USE_INET6} != "no"
-LISTS+=		${.CURDIR}/list.inet6
+LISTS+=		${DISTRIBDIR}/common/list.inet6
 .endif
diff --git a/distrib/ofppc/ramdisks/ramdisk/list.inet6 b/distrib/ofppc/ramdisks/ramdisk/list.inet6
deleted file mode 100644
index 7dff9f5e3687..000000000000
--- a/distrib/ofppc/ramdisks/ramdisk/list.inet6
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$NetBSD: list.inet6,v 1.1 2008/01/02 11:39:04 mrg Exp $
-
-PROG	sbin/ping6
-PROG	sbin/rtsol
-
-SPECIAL	ping6		srcdir	distrib/utils/x_ping6
diff --git a/distrib/rs6000/ramdisk/Makefile b/distrib/rs6000/ramdisk/Makefile
index 9a578b505b13..bff0d54a0036 100644
--- a/distrib/rs6000/ramdisk/Makefile
+++ b/distrib/rs6000/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2009/09/20 19:49:09 abs Exp $
+#	$NetBSD: Makefile,v 1.3 2009/09/20 22:50:51 abs Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -27,7 +27,7 @@ IMAGEDEPENDS=	${CRUNCHBIN} \
 SMALLPROG_INET6=1
 
 .if ${USE_INET6} != "no"
-LISTS+=		${.CURDIR}/list.inet6
+LISTS+=		${DISTRIBDIR}/common/list.inet6
 .endif
 
 # Use stubs to eliminate some large stuff from libc
diff --git a/distrib/rs6000/ramdisk/list.inet6 b/distrib/rs6000/ramdisk/list.inet6
deleted file mode 100644
index f1a77838ea1e..000000000000
--- a/distrib/rs6000/ramdisk/list.inet6
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$NetBSD: list.inet6,v 1.1 2009/04/30 12:47:39 tsutsui Exp $
-
-PROG	sbin/ping6
-PROG	sbin/rtsol
-
-SPECIAL	ping6		srcdir	distrib/utils/x_ping6
diff --git a/distrib/x68k/floppies/ramdisk/Makefile b/distrib/x68k/floppies/ramdisk/Makefile
index 8ebeb6e15b43..4f99d0d01861 100644
--- a/distrib/x68k/floppies/ramdisk/Makefile
+++ b/distrib/x68k/floppies/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.35 2009/09/20 22:46:14 abs Exp $
+#	$NetBSD: Makefile,v 1.36 2009/09/20 22:50:51 abs Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -27,7 +27,7 @@ IMAGEDEPENDS+= 	${CRUNCHBIN} \
 SMALLPROG_INET6=1
 
 .if ${USE_INET6} != "no"
-LISTS+=		${.CURDIR}/list.inet6
+LISTS+=		${DISTRIBDIR}/common/list.inet6
 .endif
 
 # Use stubs to eliminate some large stuff from libc
diff --git a/distrib/x68k/floppies/ramdisk/list.inet6 b/distrib/x68k/floppies/ramdisk/list.inet6
deleted file mode 100644
index 24832a83b7a9..000000000000
--- a/distrib/x68k/floppies/ramdisk/list.inet6
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$NetBSD: list.inet6,v 1.2 2005/12/04 21:32:11 dsl Exp $
-
-PROG	sbin/ping6
-PROG	sbin/rtsol
-
-SPECIAL	ping6		srcdir	distrib/utils/x_ping6
diff --git a/distrib/zaurus/ramdisk/Makefile b/distrib/zaurus/ramdisk/Makefile
index 14f673532c93..140c2fc0c536 100644
--- a/distrib/zaurus/ramdisk/Makefile
+++ b/distrib/zaurus/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2009/09/20 22:46:14 abs Exp $
+#	$NetBSD: Makefile,v 1.8 2009/09/20 22:50:51 abs Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -22,7 +22,7 @@ IMAGEDEPENDS=	${CRUNCHBIN} \
 		${NETBSDSRCDIR}/distrib/common/termcap.mini
 
 .if ${USE_INET6} != "no"
-LISTS+=		${.CURDIR}/list.inet6
+LISTS+=		${DISTRIBDIR}/common/list.inet6
 .endif
 
 # Use stubs to eliminate some large stuff from libc
diff --git a/distrib/zaurus/ramdisk/list.inet6 b/distrib/zaurus/ramdisk/list.inet6
deleted file mode 100644
index 6ba930568489..000000000000
--- a/distrib/zaurus/ramdisk/list.inet6
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$NetBSD: list.inet6,v 1.1 2008/03/31 23:59:07 chris Exp $
-
-PROG	sbin/ping6
-PROG	sbin/rtsol
-
-SPECIAL	ping6		srcdir	distrib/utils/x_ping6