diff --git a/etc/Makefile b/etc/Makefile
index f850fc6ee32f..524360b99a31 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.333 2006/07/23 11:44:55 lukem Exp $
+#	$NetBSD: Makefile,v 1.334 2006/08/05 13:07:30 jmmv Exp $
 #	from: @(#)Makefile	8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -112,7 +112,18 @@ BIN1+=	etc.${MACHINE}/ttyaction
 .endif
 
 # -rw-rw-r--
+.if !empty(DISTRIBVER:M*.99.*)
+BIN2+=	motd.current
+FILESNAME_motd.current=	motd
+.elif !empty(DISTRIBVER:M*BETA*)
+BIN2+=	motd.beta
+FILESNAME_motd.beta=	motd
+.elif !empty(DISTRIBVER:M*RC*)
+BIN2+=	motd.rc
+FILESNAME_motd.rc=	motd
+.else
 BIN2+=	motd
+.endif
 
 # -rw-------
 BIN3+=	hosts.equiv
diff --git a/etc/motd.beta b/etc/motd.beta
new file mode 100644
index 000000000000..c79878960654
--- /dev/null
+++ b/etc/motd.beta
@@ -0,0 +1,16 @@
+NetBSD ?.? (UNKNOWN)
+
+Welcome to NetBSD!
+
+This system is running a beta release of the NetBSD operating system, aimed
+at stabilizing the next formal release.  It is close to formal release quality
+but it may still contain bugs, even serious ones.  Please bear this in mind
+and use the system with care.
+
+You are encouraged to test this version as thoroughly as possible.  Should you
+encounter any problem, please report it back to the development team using the
+send-pr(1) utility (requires a working MTA).  If yours is not properly set up,
+use the web interface at: http://www.NetBSD.org/Misc/send-pr.html
+
+Thank you for testing this NetBSD release and helping us improve it.
+
diff --git a/etc/motd.current b/etc/motd.current
new file mode 100644
index 000000000000..6ee3cb92ae44
--- /dev/null
+++ b/etc/motd.current
@@ -0,0 +1,16 @@
+NetBSD ?.? (UNKNOWN)
+
+Welcome to NetBSD!
+
+This system is running a development snapshot of the NetBSD operating system,
+also known as NetBSD-current.  It is highly possible for it to contain serious
+bugs, regressions, broken features and any other kind of problem.  Please bear
+this in mind and use the system with care.
+
+You are encouraged to test this version as thoroughly as possible.  Should you
+encounter any problem, please report it back to the development team using the
+send-pr(1) utility (requires a working MTA).  If yours is not properly set up,
+use the web interface at: http://www.NetBSD.org/Misc/send-pr.html
+
+Thank you for testing this NetBSD release and helping us improve it.
+
diff --git a/etc/motd.rc b/etc/motd.rc
new file mode 100644
index 000000000000..e41a5fc09723
--- /dev/null
+++ b/etc/motd.rc
@@ -0,0 +1,16 @@
+NetBSD ?.? (UNKNOWN)
+
+Welcome to NetBSD!
+
+This system is running a release candidate of the NetBSD operating system,
+aimed at shaking out the most serious bugs that may affect the next formal
+release.  It is very close to formal release quality but it might still
+contain incorrections that prevent considering it as such.
+
+You are encouraged to test this version as thoroughly as possible.  Should you
+encounter any problem, please report it back to the development team using the
+send-pr(1) utility (requires a working MTA).  If yours is not properly set up,
+use the web interface at: http://www.NetBSD.org/Misc/send-pr.html
+
+Thank you for testing this NetBSD release and helping us improve it.
+