diff --git a/bin/sh/alias.c b/bin/sh/alias.c
index 3e7dc4d14db..9ef862bef45 100644
--- a/bin/sh/alias.c
+++ b/bin/sh/alias.c
@@ -32,12 +32,14 @@
  * 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.
- *
- *	$Id: alias.c,v 1.8 1997/04/28 03:06:32 steve Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)alias.c	8.3 (Berkeley) 5/4/95";
+#if 0
+static char sccsid[] = "@(#)alias.c	8.3 (Berkeley) 5/4/95";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/bin/sh/arith.y b/bin/sh/arith.y
index 5908eceaf40..49ca4745d25 100644
--- a/bin/sh/arith.y
+++ b/bin/sh/arith.y
@@ -88,11 +88,11 @@ expr:	ARITH_LPAREN expr ARITH_RPAREN = { $$ = $2; }
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: arith.y,v 1.6 1997/02/22 13:58:21 peter Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)arith.y	8.3 (Berkeley) 5/4/95";
+static char sccsid[] = "@(#)arith.y	8.3 (Berkeley) 5/4/95";
 #endif /* not lint */
 
 #include "shell.h"
diff --git a/bin/sh/arith_lex.l b/bin/sh/arith_lex.l
index d71fef0f6a9..6836d80e247 100644
--- a/bin/sh/arith_lex.l
+++ b/bin/sh/arith_lex.l
@@ -34,11 +34,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: arith_lex.l,v 1.9 1997/02/22 13:58:21 peter Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)arith_lex.l	8.3 (Berkeley) 5/4/95";
+static char sccsid[] = "@(#)arith_lex.l	8.3 (Berkeley) 5/4/95";
 #endif /* not lint */
 
 #include <unistd.h>
diff --git a/bin/sh/cd.c b/bin/sh/cd.c
index c33b7b6956c..78f71925510 100644
--- a/bin/sh/cd.c
+++ b/bin/sh/cd.c
@@ -32,12 +32,14 @@
  * 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.
- *
- *	$Id: cd.c,v 1.15 1997/04/28 03:06:32 steve Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)cd.c	8.2 (Berkeley) 5/4/95";
+#if 0
+static char sccsid[] = "@(#)cd.c	8.2 (Berkeley) 5/4/95";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/sh/error.c b/bin/sh/error.c
index b870e2e5d84..9e383e3d01c 100644
--- a/bin/sh/error.c
+++ b/bin/sh/error.c
@@ -32,12 +32,14 @@
  * 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.
- *
- *	$Id: error.c,v 1.8 1997/02/22 13:58:22 peter Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)error.c	8.2 (Berkeley) 5/4/95";
+#if 0
+static char sccsid[] = "@(#)error.c	8.2 (Berkeley) 5/4/95";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 /*
diff --git a/bin/sh/eval.c b/bin/sh/eval.c
index 0e6d86c0360..427b2bca51d 100644
--- a/bin/sh/eval.c
+++ b/bin/sh/eval.c
@@ -32,12 +32,14 @@
  * 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.
- *
- *	$Id: eval.c,v 1.13 1997/05/19 00:18:36 steve Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)eval.c	8.9 (Berkeley) 6/8/95";
+#if 0
+static char sccsid[] = "@(#)eval.c	8.9 (Berkeley) 6/8/95";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <signal.h>
diff --git a/bin/sh/exec.c b/bin/sh/exec.c
index 63f7518d920..30c083434ca 100644
--- a/bin/sh/exec.c
+++ b/bin/sh/exec.c
@@ -32,12 +32,14 @@
  * 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.
- *
- *	$Id: exec.c,v 1.10 1997/04/28 03:08:37 steve Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)exec.c	8.4 (Berkeley) 6/8/95";
+#if 0
+static char sccsid[] = "@(#)exec.c	8.4 (Berkeley) 6/8/95";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/sh/expand.c b/bin/sh/expand.c
index fe8910fb31c..38a24b0046f 100644
--- a/bin/sh/expand.c
+++ b/bin/sh/expand.c
@@ -32,12 +32,14 @@
  * 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.
- *
- *	$Id: expand.c,v 1.20 1997/06/19 15:14:01 jkh Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)expand.c	8.5 (Berkeley) 5/15/95";
+#if 0
+static char sccsid[] = "@(#)expand.c	8.5 (Berkeley) 5/15/95";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c
index 541a6ebed77..1a5dd5278ac 100644
--- a/bin/sh/histedit.c
+++ b/bin/sh/histedit.c
@@ -32,12 +32,14 @@
  * 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.
- *
- *	$Id: histedit.c,v 1.10 1997/03/28 15:24:38 imp Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)histedit.c	8.2 (Berkeley) 5/4/95";
+#if 0
+static char sccsid[] = "@(#)histedit.c	8.2 (Berkeley) 5/4/95";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/sh/input.c b/bin/sh/input.c
index 66f51f06ba4..1c9f2ad7c68 100644
--- a/bin/sh/input.c
+++ b/bin/sh/input.c
@@ -32,12 +32,14 @@
  * 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.
- *
- *	$Id: input.c,v 1.9 1997/02/22 13:58:28 peter Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)input.c	8.3 (Berkeley) 6/9/95";
+#if 0
+static char sccsid[] = "@(#)input.c	8.3 (Berkeley) 6/9/95";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <stdio.h>	/* defines BUFSIZ */
diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c
index 0d58731c930..2cfb4c3071f 100644
--- a/bin/sh/jobs.c
+++ b/bin/sh/jobs.c
@@ -32,12 +32,14 @@
  * 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.
- *
- *	$Id: jobs.c,v 1.17 1997/12/10 22:18:53 eivind Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)jobs.c	8.5 (Berkeley) 5/4/95";
+#if 0
+static char sccsid[] = "@(#)jobs.c	8.5 (Berkeley) 5/4/95";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <fcntl.h>
diff --git a/bin/sh/mail.c b/bin/sh/mail.c
index 4269d753711..965f69dde39 100644
--- a/bin/sh/mail.c
+++ b/bin/sh/mail.c
@@ -32,12 +32,14 @@
  * 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.
- *
- *	$Id: mail.c,v 1.6 1997/02/22 13:58:31 peter Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)mail.c	8.2 (Berkeley) 5/4/95";
+#if 0
+static char sccsid[] = "@(#)mail.c	8.2 (Berkeley) 5/4/95";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 /*
diff --git a/bin/sh/main.c b/bin/sh/main.c
index 99b23eb9005..3cd49d23fbf 100644
--- a/bin/sh/main.c
+++ b/bin/sh/main.c
@@ -32,8 +32,6 @@
  * 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.
- *
- *	$Id: main.c,v 1.13 1997/02/22 13:58:33 peter Exp $
  */
 
 #ifndef lint
@@ -43,7 +41,11 @@ static char const copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char const sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/28/95";
+#if 0
+static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/28/95";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/bin/sh/memalloc.c b/bin/sh/memalloc.c
index b69c12851c9..3f398255556 100644
--- a/bin/sh/memalloc.c
+++ b/bin/sh/memalloc.c
@@ -32,12 +32,14 @@
  * 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.
- *
- *	$Id: memalloc.c,v 1.7 1997/02/22 13:58:34 peter Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)memalloc.c	8.3 (Berkeley) 5/4/95";
+#if 0
+static char sccsid[] = "@(#)memalloc.c	8.3 (Berkeley) 5/4/95";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include "shell.h"
diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c
index 7fbb3392ddb..85d109143f7 100644
--- a/bin/sh/miscbltin.c
+++ b/bin/sh/miscbltin.c
@@ -32,12 +32,14 @@
  * 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.
- *
- *	$Id: miscbltin.c,v 1.13 1997/05/19 00:18:43 steve Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)miscbltin.c	8.4 (Berkeley) 5/4/95";
+#if 0
+static char sccsid[] = "@(#)miscbltin.c	8.4 (Berkeley) 5/4/95";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 /*
diff --git a/bin/sh/mkinit.c b/bin/sh/mkinit.c
index fda310bbe6d..fc1307cabe5 100644
--- a/bin/sh/mkinit.c
+++ b/bin/sh/mkinit.c
@@ -32,8 +32,6 @@
  * 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.
- *
- *	$Id: mkinit.c,v 1.10 1997/04/28 03:06:37 steve Exp $
  */
 
 #ifndef lint
@@ -43,7 +41,11 @@ static char const copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char const sccsid[] = "@(#)mkinit.c	8.2 (Berkeley) 5/4/95";
+#if 0
+static char sccsid[] = "@(#)mkinit.c	8.2 (Berkeley) 5/4/95";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 /*
diff --git a/bin/sh/mknodes.c b/bin/sh/mknodes.c
index 672b801b121..f1fe5ee0dfb 100644
--- a/bin/sh/mknodes.c
+++ b/bin/sh/mknodes.c
@@ -32,8 +32,6 @@
  * 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.
- *
- *	$Id: mknodes.c,v 1.7 1997/02/22 13:58:36 peter Exp $
  */
 
 #ifndef lint
@@ -43,7 +41,11 @@ static char const copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char const sccsid[] = "@(#)mknodes.c	8.2 (Berkeley) 5/4/95";
+#if 0
+static char sccsid[] = "@(#)mknodes.c	8.2 (Berkeley) 5/4/95";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 /*
diff --git a/bin/sh/mksyntax.c b/bin/sh/mksyntax.c
index a7abd7f2423..051cbc5da20 100644
--- a/bin/sh/mksyntax.c
+++ b/bin/sh/mksyntax.c
@@ -32,8 +32,6 @@
  * 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.
- *
- *	$Id: mksyntax.c,v 1.9 1997/02/22 13:58:37 peter Exp $
  */
 
 #ifndef lint
@@ -43,7 +41,11 @@ static char const copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char const sccsid[] = "@(#)mksyntax.c	8.2 (Berkeley) 5/4/95";
+#if 0
+static char sccsid[] = "@(#)mksyntax.c	8.2 (Berkeley) 5/4/95";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 /*
diff --git a/bin/sh/mystring.c b/bin/sh/mystring.c
index af346356f10..b960bdc11c4 100644
--- a/bin/sh/mystring.c
+++ b/bin/sh/mystring.c
@@ -32,12 +32,14 @@
  * 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.
- *
- *	$Id: mystring.c,v 1.7 1997/02/22 13:58:38 peter Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)mystring.c	8.2 (Berkeley) 5/4/95";
+#if 0
+static char sccsid[] = "@(#)mystring.c	8.2 (Berkeley) 5/4/95";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 /*
diff --git a/bin/sh/options.c b/bin/sh/options.c
index 9007d72e044..0b65645913b 100644
--- a/bin/sh/options.c
+++ b/bin/sh/options.c
@@ -32,12 +32,14 @@
  * 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.
- *
- *	$Id: options.c,v 1.12 1997/02/22 13:58:40 peter Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)options.c	8.2 (Berkeley) 5/4/95";
+#if 0
+static char sccsid[] = "@(#)options.c	8.2 (Berkeley) 5/4/95";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <signal.h>
diff --git a/bin/sh/output.c b/bin/sh/output.c
index 449e5067228..1421b4660da 100644
--- a/bin/sh/output.c
+++ b/bin/sh/output.c
@@ -32,12 +32,14 @@
  * 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.
- *
- *	$Id: output.c,v 1.7 1997/02/22 13:58:41 peter Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)output.c	8.2 (Berkeley) 5/4/95";
+#if 0
+static char sccsid[] = "@(#)output.c	8.2 (Berkeley) 5/4/95";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 /*
diff --git a/bin/sh/parser.c b/bin/sh/parser.c
index c86f0a13c67..0999b222cff 100644
--- a/bin/sh/parser.c
+++ b/bin/sh/parser.c
@@ -32,12 +32,14 @@
  * 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.
- *
- *	$Id: parser.c,v 1.20 1997/04/28 03:22:09 steve Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)parser.c	8.7 (Berkeley) 5/16/95";
+#if 0
+static char sccsid[] = "@(#)parser.c	8.7 (Berkeley) 5/16/95";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/bin/sh/redir.c b/bin/sh/redir.c
index 86228fd05f9..aa1b7c8dcf4 100644
--- a/bin/sh/redir.c
+++ b/bin/sh/redir.c
@@ -32,12 +32,14 @@
  * 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.
- *
- *	$Id: redir.c,v 1.8 1997/02/22 13:58:43 peter Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)redir.c	8.2 (Berkeley) 5/4/95";
+#if 0
+static char sccsid[] = "@(#)redir.c	8.2 (Berkeley) 5/4/95";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/sh/sh.1 b/bin/sh/sh.1
index 6041947dcd2..471911904ff 100644
--- a/bin/sh/sh.1
+++ b/bin/sh/sh.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
-.\"	$Id: sh.1,v 1.18 1998/01/02 19:23:05 steve Exp $
+.\"	$Id: sh.1,v 1.19 1998/02/12 01:23:11 jdp Exp $
 .\"
 .Dd May 5, 1995
 .Dt SH 1
@@ -48,7 +48,7 @@
 .Op Fl c Ar string
 .Op Ar arg ...
 .Sh DESCRIPTION
-.Nm sh
+.Nm Sh
 is the standard command interpreter for the system.
 The current version of
 .Nm
@@ -1092,7 +1092,7 @@ The following environment variables affect the execution of fc:
 .It Va FCEDIT
 Name of the editor to use.
 .It Va HISTSIZE
-The number of previous commands that are accessable.
+The number of previous commands that are accessible.
 .El
 .It fg [ job ]
 Move the specified job or the current job to the
diff --git a/bin/sh/show.c b/bin/sh/show.c
index cd7b1957a17..b49c14795af 100644
--- a/bin/sh/show.c
+++ b/bin/sh/show.c
@@ -32,12 +32,14 @@
  * 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.
- *
- *	$Id: show.c,v 1.7 1997/02/22 13:58:45 peter Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)show.c	8.3 (Berkeley) 5/4/95";
+#if 0
+static char sccsid[] = "@(#)show.c	8.3 (Berkeley) 5/4/95";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/bin/sh/trap.c b/bin/sh/trap.c
index 94d6d7ce090..b21928f2aeb 100644
--- a/bin/sh/trap.c
+++ b/bin/sh/trap.c
@@ -32,12 +32,14 @@
  * 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.
- *
- *	$Id: trap.c,v 1.9 1997/11/05 23:33:58 ache Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)trap.c	8.5 (Berkeley) 6/5/95";
+#if 0
+static char sccsid[] = "@(#)trap.c	8.5 (Berkeley) 6/5/95";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <signal.h>
diff --git a/bin/sh/var.c b/bin/sh/var.c
index a64cbfdcf31..d1f2b7669ed 100644
--- a/bin/sh/var.c
+++ b/bin/sh/var.c
@@ -32,12 +32,14 @@
  * 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.
- *
- *	$Id: var.c,v 1.10 1997/04/28 03:06:39 steve Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)var.c	8.3 (Berkeley) 5/4/95";
+#if 0
+static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 5/4/95";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <unistd.h>