diff --git a/usr.bin/column/column.c b/usr.bin/column/column.c
index 4a019044576f..21bff28d31ca 100644
--- a/usr.bin/column/column.c
+++ b/usr.bin/column/column.c
@@ -29,19 +29,21 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
+
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1989, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
+#endif
 
 #ifndef lint
 static const char sccsid[] = "@(#)column.c	8.4 (Berkeley) 5/4/95";
-#endif /* not lint */
+#endif
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/usr.bin/comm/comm.c b/usr.bin/comm/comm.c
index 4a359843f479..941233ee9068 100644
--- a/usr.bin/comm/comm.c
+++ b/usr.bin/comm/comm.c
@@ -34,19 +34,19 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
+
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1989, 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[] = "From: @(#)comm.c	8.4 (Berkeley) 5/4/95";
+static const char sccsid[] = "From: @(#)comm.c	8.4 (Berkeley) 5/4/95";
 #endif
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
 
 #include <ctype.h>
 #include <err.h>