diff --git a/util/opt/alloc.h b/util/opt/alloc.h
index edfdaead4..23c2e3890 100644
--- a/util/opt/alloc.h
+++ b/util/opt/alloc.h
@@ -1,3 +1,5 @@
+/* $Header$ */
+
 extern line_p 	newline();
 extern offset	*newrom();
 extern sym_p	newsym();
diff --git a/util/opt/assert.h b/util/opt/assert.h
index 7617f9b2f..c117405c1 100644
--- a/util/opt/assert.h
+++ b/util/opt/assert.h
@@ -1,3 +1,5 @@
+/* $Header$ */
+
 #ifndef NDEBUG
 #define assert(x) if(!(x)) badassertion(__FILE__,__LINE__)
 #else
diff --git a/util/opt/ext.h b/util/opt/ext.h
index 10d6f0d2d..79767b296 100644
--- a/util/opt/ext.h
+++ b/util/opt/ext.h
@@ -1,3 +1,5 @@
+/* $Header$ */
+
 #ifndef FILE
 #include <stdio.h>
 #endif
diff --git a/util/opt/line.h b/util/opt/line.h
index 8f20bf3a8..d24237da5 100644
--- a/util/opt/line.h
+++ b/util/opt/line.h
@@ -1,3 +1,5 @@
+/* $Header$ */
+
 #define NARGBYTES	14
 struct argbytes {
 	argb_p	ab_next;
diff --git a/util/opt/lookup.h b/util/opt/lookup.h
index a8dd4ffc1..53dc6b660 100644
--- a/util/opt/lookup.h
+++ b/util/opt/lookup.h
@@ -1,3 +1,5 @@
+/* $Header$ */
+
 #define IDL	8
 
 struct sym {
diff --git a/util/opt/makedepend b/util/opt/makedepend
index a1af4cc60..31e2e20da 100755
--- a/util/opt/makedepend
+++ b/util/opt/makedepend
@@ -1,3 +1,4 @@
+: '$Header$'
 for extension in c y
 do
     for file in *.$extension
diff --git a/util/opt/mktab.y b/util/opt/mktab.y
index a3daa271d..f5bffa8aa 100644
--- a/util/opt/mktab.y
+++ b/util/opt/mktab.y
@@ -1,4 +1,8 @@
 %{
+#ifndef NORCSID
+static char rcsid[] = "$Header$";
+#endif
+
 #include <stdio.h>
 #include "param.h"
 #include "types.h"
diff --git a/util/opt/optim.h b/util/opt/optim.h
index 4dfea7cdc..d59e4375f 100644
--- a/util/opt/optim.h
+++ b/util/opt/optim.h
@@ -1,3 +1,5 @@
+/* $Header$ */
+
 /* #define DIAGOPT /* if defined diagnostics are produced */
 #ifdef DIAGOPT
 #define OPTIM(x) optim(x)
diff --git a/util/opt/param.h b/util/opt/param.h
index c87d32e89..167d12657 100644
--- a/util/opt/param.h
+++ b/util/opt/param.h
@@ -1,3 +1,5 @@
+/* $Header$ */
+
 #define LONGOFF		/* if defined long offsets are used */
 
 #define TRUE	1
diff --git a/util/opt/pattern.h b/util/opt/pattern.h
index 4066fa7c3..e22119348 100644
--- a/util/opt/pattern.h
+++ b/util/opt/pattern.h
@@ -1,3 +1,5 @@
+/* $Header$ */
+
 /*
  * pattern contains the optimization patterns in an apparently
  * unordered fashion. All patterns follow each other unaligned.
diff --git a/util/opt/patterns b/util/opt/patterns
index b993e8f84..a6ace04ba 100644
--- a/util/opt/patterns
+++ b/util/opt/patterns
@@ -1,3 +1,4 @@
+# $Header$
 loc adi loc sbi $2==w && $4==w: loc $1-$3 adi w
 ldc adi ldc sbi $2==2*w && $4==2*w:     ldc $1-$3 adi 2*w
 loc adi loc adi $2==w && $4==w: loc $1+$3 adi w
@@ -438,8 +439,8 @@ lal loi lal sti $2==$4 && $2>4*w && ( $3<=$1-$2 || $3>=$1+$2 ) :
 lae loi lae sti $2==$4 && $2>4*w && ( !defined($1==$3) || $3<=$1-$2 || $3>=$1+$2 ) :
 	lae $1 lae $3 blm $2
 loc loc loc cif $1==0 && $2==w :	zrf $3
-loc loc loc cii $2==w && $3==2*w : ldc $1
-loc loc loc ciu $1>=0 && $2==w && $3==2*w : ldc $1
+loc loc loc ciu $1>=0 && $2==w && $3==2*w :	ldc $1
+loc loc loc cii $2==w && $3==2*w :	ldc $1
 loi loc inn $1==$3 && $2>=0 && $2<$1*8 : 
 	lof ($2/(8*w))*w loc $2&(8*w-1) inn w
 ldl loc inn $3==2*w && $2>=0 && $2<16*w : 
diff --git a/util/opt/testopt b/util/opt/testopt
index 4fb8f3e6d..02f32f083 100755
--- a/util/opt/testopt
+++ b/util/opt/testopt
@@ -1,3 +1,4 @@
+: '$Header$'
 while true
 do
   (echo ' mes 2,2,2
diff --git a/util/opt/types.h b/util/opt/types.h
index de4df5b88..9b9462194 100644
--- a/util/opt/types.h
+++ b/util/opt/types.h
@@ -1,3 +1,5 @@
+/* $Header$ */
+
 typedef char byte;
 typedef char bool;
 typedef struct line line_t;