diff --git a/tftp/tftpsubs.c b/tftp/tftpsubs.c
index b0ecc91..53ca7d5 100644
--- a/tftp/tftpsubs.c
+++ b/tftp/tftpsubs.c
@@ -1,5 +1,7 @@
-/*	$OpenBSD: tftpsubs.c,v 1.2 1996/06/26 05:40:36 deraadt Exp $	*/
-/*	$NetBSD: tftpsubs.c,v 1.3 1994/12/08 09:51:31 jtc Exp $	*/
+/* tftp-hpa: $Id$ */
+
+/* $OpenBSD: tftpsubs.c,v 1.2 1996/06/26 05:40:36 deraadt Exp $	*/
+/* $NetBSD: tftpsubs.c,v 1.3 1994/12/08 09:51:31 jtc Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,10 +37,9 @@
  */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)tftpsubs.c	8.1 (Berkeley) 6/6/93";
-#endif
-static char rcsid[] = "$OpenBSD: tftpsubs.c,v 1.2 1996/06/26 05:40:36 deraadt Exp $";
+/* static char sccsid[] = "@(#)tftpsubs.c	8.1 (Berkeley) 6/6/93"; */
+/* static char rcsid[] = "$OpenBSD: tftpsubs.c,v 1.2 1996/06/26 05:40:36 deraadt Exp $"; */
+static const char *rcsid = "tftp-hpa: $Id$";
 #endif /* not lint */
 
 /* Simple minded read-ahead/write-behind subroutines for tftp user and