diff --git a/bin/chflags/Makefile b/bin/chflags/Makefile
index 3493b982983..aa7e2659aaa 100644
--- a/bin/chflags/Makefile
+++ b/bin/chflags/Makefile
@@ -6,6 +6,6 @@ NOSHARED?=yes
 
 PROG=	chflags
 SRCS=	chflags.c
-
 WARNS?=	2
+
 .include <bsd.prog.mk>
diff --git a/bin/chflags/chflags.c b/bin/chflags/chflags.c
index f46baa0efae..bac0496a0ac 100644
--- a/bin/chflags/chflags.c
+++ b/bin/chflags/chflags.c
@@ -31,19 +31,19 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
+
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1992, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
+#endif
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)chflags.c	8.5 (Berkeley) 4/1/94";
+static const char sccsid[] = "@(#)chflags.c	8.5 (Berkeley) 4/1/94";
 #endif
-static const char rcsid[] =
-	"$FreeBSD$";
-#endif /* not lint */
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/chflags/Makefile b/usr.bin/chflags/Makefile
index 3493b982983..aa7e2659aaa 100644
--- a/usr.bin/chflags/Makefile
+++ b/usr.bin/chflags/Makefile
@@ -6,6 +6,6 @@ NOSHARED?=yes
 
 PROG=	chflags
 SRCS=	chflags.c
-
 WARNS?=	2
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/chflags/chflags.c b/usr.bin/chflags/chflags.c
index f46baa0efae..bac0496a0ac 100644
--- a/usr.bin/chflags/chflags.c
+++ b/usr.bin/chflags/chflags.c
@@ -31,19 +31,19 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
+
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1992, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
+#endif
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)chflags.c	8.5 (Berkeley) 4/1/94";
+static const char sccsid[] = "@(#)chflags.c	8.5 (Berkeley) 4/1/94";
 #endif
-static const char rcsid[] =
-	"$FreeBSD$";
-#endif /* not lint */
 
 #include <sys/types.h>
 #include <sys/stat.h>