diff --git a/libexec/getty/main.c b/libexec/getty/main.c
index d2d090511b0e..4cfad1b88005 100644
--- a/libexec/getty/main.c
+++ b/libexec/getty/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.24 1997/11/18 21:29:11 thorpej Exp $	*/
+/*	$NetBSD: main.c,v 1.25 1998/03/30 01:52:02 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1980, 1993
@@ -44,7 +44,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
 #if 0
 static char sccsid[] = "from: @(#)main.c	8.1 (Berkeley) 6/20/93";
 #else
-__RCSID("$NetBSD: main.c,v 1.24 1997/11/18 21:29:11 thorpej Exp $");
+__RCSID("$NetBSD: main.c,v 1.25 1998/03/30 01:52:02 mrg Exp $");
 #endif
 #endif /* not lint */
 
@@ -335,7 +335,7 @@ main(argc, argv)
 			alarm(TO);
 		}
 		if (getname()) {
-			register int i;
+			int i;
 
 			oflush();
 			alarm(0);
@@ -385,8 +385,8 @@ main(argc, argv)
 static int
 getname()
 {
-	register int c;
-	register char *np;
+	int c;
+	char *np;
 	char cs;
 
 	/*
@@ -467,9 +467,9 @@ getname()
 
 static void
 putpad(s)
-	register const char *s;
+	const char *s;
 {
-	register pad = 0;
+	int pad = 0;
 	speed_t ospeed = cfgetospeed(&tmode);
 
 	if (isdigit(*s)) {
@@ -505,7 +505,7 @@ putpad(s)
 
 static void
 xputs(s)
-	register const char *s;
+	const char *s;
 {
 	while (*s)
 		putchr(*s++);
@@ -553,7 +553,7 @@ prompt()
 
 static void
 putf(cp)
-	register const char *cp;
+	const char *cp;
 {
 	extern char editedhost[];
 	time_t t;
diff --git a/libexec/getty/subr.c b/libexec/getty/subr.c
index 2c9bc3aeb022..5b62315e2313 100644
--- a/libexec/getty/subr.c
+++ b/libexec/getty/subr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr.c,v 1.22 1997/08/06 07:22:26 mikel Exp $	*/
+/*	$NetBSD: subr.c,v 1.23 1998/03/30 01:52:02 mrg Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "from: @(#)subr.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: subr.c,v 1.22 1997/08/06 07:22:26 mikel Exp $");
+__RCSID("$NetBSD: subr.c,v 1.23 1998/03/30 01:52:02 mrg Exp $");
 #endif
 #endif /* not lint */
 
@@ -69,9 +69,9 @@ void
 gettable(name, buf)
 	char *name, *buf;
 {
-	register struct gettystrs *sp;
-	register struct gettynums *np;
-	register struct gettyflags *fp;
+	struct gettystrs *sp;
+	struct gettynums *np;
+	struct gettyflags *fp;
 	long n;
 	char *dba[2];
 	dba[0] = _PATH_GETTYTAB;
@@ -114,9 +114,9 @@ gettable(name, buf)
 void
 gendefaults()
 {
-	register struct gettystrs *sp;
-	register struct gettynums *np;
-	register struct gettyflags *fp;
+	struct gettystrs *sp;
+	struct gettynums *np;
+	struct gettyflags *fp;
 
 	for (sp = gettystrs; sp->field; sp++)
 		if (sp->value)
@@ -134,9 +134,9 @@ gendefaults()
 void
 setdefaults()
 {
-	register struct gettystrs *sp;
-	register struct gettynums *np;
-	register struct gettyflags *fp;
+	struct gettystrs *sp;
+	struct gettynums *np;
+	struct gettyflags *fp;
 
 	for (sp = gettystrs; sp->field; sp++)
 		if (!sp->value)
@@ -167,8 +167,8 @@ charvars[] = {
 void
 setchars()
 {
-	register int i;
-	register char *p;
+	int i;
+	char *p;
 
 	for (i = 0; charnames[i]; i++) {
 		p = *charnames[i];
@@ -188,7 +188,7 @@ void
 setflags(n)
 	int n;
 {
-	register tcflag_t iflag, oflag, cflag, lflag;
+	tcflag_t iflag, oflag, cflag, lflag;
 
 #ifdef COMPAT_43
 	switch (n) {
@@ -368,9 +368,9 @@ out:
  */
 void
 compatflags(flags)
-register long flags;
+	long flags;
 {
-	register tcflag_t iflag, oflag, cflag, lflag;
+	tcflag_t iflag, oflag, cflag, lflag;
 
 	iflag = BRKINT|ICRNL|IMAXBEL|IXON|IXANY;
 	oflag = OPOST|ONLCR|OXTABS;
@@ -537,7 +537,7 @@ struct delayval	tbdelay[] = {
 int
 delaybits()
 {
-	register int f;
+	int f;
 
 	f  = adelay(CD, crdelay);
 	f |= adelay(ND, nldelay);
@@ -549,8 +549,8 @@ delaybits()
 
 int
 adelay(ms, dp)
-	register ms;
-	register struct delayval *dp;
+	ms;
+	struct delayval *dp;
 {
 	if (ms == 0)
 		return (0);
@@ -564,10 +564,10 @@ char	editedhost[MAXHOSTNAMELEN];
 
 void
 edithost(pat)
-	register char *pat;
+	char *pat;
 {
-	register char *host = HN;
-	register char *res = editedhost;
+	char *host = HN;
+	char *res = editedhost;
 
 	if (!pat)
 		pat = "";
@@ -607,8 +607,8 @@ makeenv(env)
 	char *env[];
 {
 	static char termbuf[128] = "TERM=";
-	register char *p, *q;
-	register char **ep;
+	char *p, *q;
+	char **ep;
 
 	ep = env;
 	if (TT && *TT) {
@@ -656,7 +656,7 @@ char *
 portselector()
 {
 	char c, baud[20], *type = "default";
-	register struct portselect *ps;
+	struct portselect *ps;
 	int len;
 
 	alarm(5*60);
diff --git a/libexec/rlogind/rlogind.c b/libexec/rlogind/rlogind.c
index 94a76245edf1..e5b0c9c40703 100644
--- a/libexec/rlogind/rlogind.c
+++ b/libexec/rlogind/rlogind.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rlogind.c,v 1.12 1997/10/08 01:04:31 enami Exp $	*/
+/*	$NetBSD: rlogind.c,v 1.13 1998/03/30 01:53:07 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1983, 1988, 1989, 1993
@@ -40,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1989, 1993\n\
 #if 0
 static char sccsid[] = "@(#)rlogind.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: rlogind.c,v 1.12 1997/10/08 01:04:31 enami Exp $");
+__RCSID("$NetBSD: rlogind.c,v 1.13 1998/03/30 01:53:07 mrg Exp $");
 #endif
 #endif /* not lint */
 
@@ -177,7 +177,7 @@ doit(f, fromp)
 {
 	int master, pid, on = 1;
 	int authenticated = 0;
-	register struct hostent *hp;
+	struct hostent *hp;
 	char utmphost[UT_HOSTSIZE + 1];
 	char *hostname;
 	char hostnamebuf[2 * MAXHOSTNAMELEN + 1];
@@ -348,11 +348,11 @@ control(pty, cp, n)
  */
 void
 protocol(f, p)
-	register int f, p;
+	int f, p;
 {
 	char pibuf[1024+1], fibuf[1024], *pbp = NULL, *fbp = NULL;
 					/* XXX gcc above */
-	register pcc = 0, fcc = 0;
+	int pcc = 0, fcc = 0;
 	int cc, nfd, n;
 	char cntl;
 
@@ -417,7 +417,7 @@ protocol(f, p)
 			if (fcc < 0 && errno == EWOULDBLOCK)
 				fcc = 0;
 			else {
-				register char *cp;
+				char *cp;
 				int left, n;
 
 				if (fcc <= 0)
@@ -590,7 +590,7 @@ void
 setup_term(fd)
 	int fd;
 {
-	register char *cp = index(term+ENVSIZE, '/');
+	char *cp = index(term+ENVSIZE, '/');
 	char *speed;
 	struct termios tt;
 
@@ -662,7 +662,7 @@ char *
 topdomain(h)
 	char *h;
 {
-	register char *p;
+	char *p;
 	char *maybe = NULL;
 	int dots = 0;