diff --git a/usr.bin/indent/args.c b/usr.bin/indent/args.c
index 2e6821fe62b8..3ddab3309a2f 100644
--- a/usr.bin/indent/args.c
+++ b/usr.bin/indent/args.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)args.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "@(#)$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/indent/indent.c b/usr.bin/indent/indent.c
index 1a8675581134..3b82e95f38de 100644
--- a/usr.bin/indent/indent.c
+++ b/usr.bin/indent/indent.c
@@ -46,7 +46,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)indent.c	5.17 (Berkeley) 6/7/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "@(#)$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/indent/indent_codes.h b/usr.bin/indent/indent_codes.h
index 8373d4e933ae..e1ff294e2576 100644
--- a/usr.bin/indent/indent_codes.h
+++ b/usr.bin/indent/indent_codes.h
@@ -33,6 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)indent_codes.h	8.1 (Berkeley) 6/6/93
+ * $FreeBSD$
  */
 
 #define newline		1
diff --git a/usr.bin/indent/io.c b/usr.bin/indent/io.c
index 596c849d6c35..bc186e713eb5 100644
--- a/usr.bin/indent/io.c
+++ b/usr.bin/indent/io.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)io.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "@(#)$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/indent/lexi.c b/usr.bin/indent/lexi.c
index 2db3e0a2f06c..67fea44d153e 100644
--- a/usr.bin/indent/lexi.c
+++ b/usr.bin/indent/lexi.c
@@ -35,7 +35,8 @@
 
 #ifndef lint
 static char sccsid[] = "@(#)lexi.c	8.1 (Berkeley) 6/6/93";
-static char rcsid[] = "@(#)$FreeBSD$";
+static const char rcsid[] =
+  "@(#)$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/indent/parse.c b/usr.bin/indent/parse.c
index eeeb30acc22f..33ce79e28a8e 100644
--- a/usr.bin/indent/parse.c
+++ b/usr.bin/indent/parse.c
@@ -35,6 +35,8 @@
 
 #ifndef lint
 static char sccsid[] = "@(#)parse.c	8.1 (Berkeley) 6/6/93";
+static const char rcsid[] =
+  "@(#)$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.bin/indent/pr_comment.c b/usr.bin/indent/pr_comment.c
index ec73d6c65aec..357d9072db46 100644
--- a/usr.bin/indent/pr_comment.c
+++ b/usr.bin/indent/pr_comment.c
@@ -35,7 +35,8 @@
 
 #ifndef lint
 static char sccsid[] = "@(#)pr_comment.c	8.1 (Berkeley) 6/6/93";
-static char rcsid[] = "@(#)$FreeBSD$";
+static const char rcsid[] =
+  "@(#)$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>