diff --git a/src/lib/libutil/fmt_scaled.c b/src/lib/libutil/fmt_scaled.c
index c73d6286..6b874828 100644
--- a/src/lib/libutil/fmt_scaled.c
+++ b/src/lib/libutil/fmt_scaled.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fmt_scaled.c,v 1.6 2005/03/09 09:27:57 otto Exp $	*/
+/*	$OpenBSD: fmt_scaled.c,v 1.7 2005/08/02 21:46:23 espie Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Ian F. Darwin.  All rights reserved.
@@ -36,10 +36,6 @@
  * Scanning code written for OpenBSD libutil.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char ident[] = "$OpenBSD: fmt_scaled.c,v 1.6 2005/03/09 09:27:57 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/src/lib/libutil/fparseln.c b/src/lib/libutil/fparseln.c
index 6807ac35..a8c57e80 100644
--- a/src/lib/libutil/fparseln.c
+++ b/src/lib/libutil/fparseln.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fparseln.c,v 1.5 2004/05/28 07:03:47 deraadt Exp $	*/
+/*	$OpenBSD: fparseln.c,v 1.6 2005/08/02 21:46:23 espie Exp $	*/
 /*	$NetBSD: fparseln.c,v 1.7 1999/07/02 15:49:12 simonb Exp $	*/
 
 /*
@@ -30,10 +30,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: fparseln.c,v 1.5 2004/05/28 07:03:47 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/cdefs.h>
 
 #include <stdio.h>
diff --git a/src/lib/libutil/getmaxpartitions.c b/src/lib/libutil/getmaxpartitions.c
index 41a7b044..d6a5ced3 100644
--- a/src/lib/libutil/getmaxpartitions.c
+++ b/src/lib/libutil/getmaxpartitions.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getmaxpartitions.c,v 1.4 2004/05/28 07:03:47 deraadt Exp $	*/
+/*	$OpenBSD: getmaxpartitions.c,v 1.5 2005/08/02 21:46:23 espie Exp $	*/
 /*	$NetBSD: getmaxpartitions.c,v 1.1 1996/05/16 07:03:31 thorpej Exp $	*/
 
 /*-
@@ -37,10 +37,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$NetBSD: getmaxpartitions.c,v 1.1 1996/05/16 07:03:31 thorpej Exp $";
-#endif
-
 #include <sys/param.h>
 #include <sys/sysctl.h>
 
diff --git a/src/lib/libutil/getrawpartition.c b/src/lib/libutil/getrawpartition.c
index e4290c36..c94173f9 100644
--- a/src/lib/libutil/getrawpartition.c
+++ b/src/lib/libutil/getrawpartition.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getrawpartition.c,v 1.4 2004/05/28 07:03:47 deraadt Exp $	*/
+/*	$OpenBSD: getrawpartition.c,v 1.5 2005/08/02 21:46:23 espie Exp $	*/
 /*	$NetBSD: getrawpartition.c,v 1.1 1996/05/16 07:03:33 thorpej Exp $	*/
 
 /*-
@@ -37,10 +37,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$NetBSD: getrawpartition.c,v 1.1 1996/05/16 07:03:33 thorpej Exp $";
-#endif
-
 #include <sys/param.h>
 #include <sys/sysctl.h>
 
diff --git a/src/lib/libutil/login.c b/src/lib/libutil/login.c
index f97f00f9..7d3eec4a 100644
--- a/src/lib/libutil/login.c
+++ b/src/lib/libutil/login.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: login.c,v 1.9 2004/05/28 07:03:47 deraadt Exp $	*/
+/*	$OpenBSD: login.c,v 1.10 2005/08/02 21:46:23 espie Exp $	*/
 /*
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -28,11 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-/* from: static char sccsid[] = "@(#)login.c	8.1 (Berkeley) 6/4/93"; */
-static const char rcsid[] = "$Id: login.c,v 1.9 2004/05/28 07:03:47 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 
 #include <fcntl.h>
diff --git a/src/lib/libutil/login_tty.c b/src/lib/libutil/login_tty.c
index e71d8c54..7a7c6a44 100644
--- a/src/lib/libutil/login_tty.c
+++ b/src/lib/libutil/login_tty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: login_tty.c,v 1.6 2004/05/28 07:03:47 deraadt Exp $	*/
+/*	$OpenBSD: login_tty.c,v 1.7 2005/08/02 21:46:23 espie Exp $	*/
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -28,11 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-/* from: static char sccsid[] = "@(#)login_tty.c	8.1 (Berkeley) 6/4/93"; */
-static const char rcsid[] = "$Id: login_tty.c,v 1.6 2004/05/28 07:03:47 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
diff --git a/src/lib/libutil/logout.c b/src/lib/libutil/logout.c
index e882c1f4..51116f1f 100644
--- a/src/lib/libutil/logout.c
+++ b/src/lib/libutil/logout.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: logout.c,v 1.7 2004/05/28 07:03:47 deraadt Exp $	*/
+/*	$OpenBSD: logout.c,v 1.8 2005/08/02 21:46:23 espie Exp $	*/
 /*
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -28,11 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-/* from: static char sccsid[] = "@(#)logout.c	8.1 (Berkeley) 6/4/93"; */
-static const char rcsid[] = "$Id: logout.c,v 1.7 2004/05/28 07:03:47 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 #include <sys/time.h>
 
diff --git a/src/lib/libutil/logwtmp.c b/src/lib/libutil/logwtmp.c
index 2ab7b8a5..0f968c76 100644
--- a/src/lib/libutil/logwtmp.c
+++ b/src/lib/libutil/logwtmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: logwtmp.c,v 1.8 2004/09/18 19:22:09 deraadt Exp $	*/
+/*	$OpenBSD: logwtmp.c,v 1.9 2005/08/02 21:46:23 espie Exp $	*/
 /*
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -28,11 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-/* from: static char sccsid[] = "@(#)logwtmp.c	8.1 (Berkeley) 6/4/93"; */
-static const char rcsid[] = "$Id: logwtmp.c,v 1.8 2004/09/18 19:22:09 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>
diff --git a/src/lib/libutil/passwd.c b/src/lib/libutil/passwd.c
index ba7a0a52..b176234d 100644
--- a/src/lib/libutil/passwd.c
+++ b/src/lib/libutil/passwd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: passwd.c,v 1.45 2004/11/04 18:44:59 millert Exp $	*/
+/*	$OpenBSD: passwd.c,v 1.46 2005/08/02 21:46:23 espie Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993, 1994, 1995
@@ -29,10 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: passwd.c,v 1.45 2004/11/04 18:44:59 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>
diff --git a/src/lib/libutil/pidfile.c b/src/lib/libutil/pidfile.c
index 532e63c4..0af51287 100644
--- a/src/lib/libutil/pidfile.c
+++ b/src/lib/libutil/pidfile.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pidfile.c,v 1.6 2004/05/28 07:03:47 deraadt Exp $	*/
+/*	$OpenBSD: pidfile.c,v 1.7 2005/08/02 21:46:23 espie Exp $	*/
 /*	$NetBSD: pidfile.c,v 1.4 2001/02/19 22:43:42 cgd Exp $	*/
 
 /*-
@@ -37,10 +37,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: pidfile.c,v 1.6 2004/05/28 07:03:47 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/param.h>
 #include <errno.h>
 #include <paths.h>
diff --git a/src/lib/libutil/pty.c b/src/lib/libutil/pty.c
index 4fccc1a3..a9d80528 100644
--- a/src/lib/libutil/pty.c
+++ b/src/lib/libutil/pty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pty.c,v 1.13 2004/05/28 07:03:47 deraadt Exp $	*/
+/*	$OpenBSD: pty.c,v 1.14 2005/08/02 21:46:23 espie Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -29,11 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-/* from: static char sccsid[] = "@(#)pty.c	8.1 (Berkeley) 6/4/93"; */
-static const char rcsid[] = "$Id: pty.c,v 1.13 2004/05/28 07:03:47 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stat.h>