diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 4321ff25c31..1957b3940c0 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2000-04-26  Jonathan Larmour  <jlarmour@redhat.co.uk>
+
+	* index-prop: Fix occasional problem when using cvs diff -p
+
 2000-04-18  Zack Weinberg  <zack@wolery.cumb.org>
 
 	* gcc_update: Remove references to cexp.c/cexp.y.
diff --git a/contrib/index-prop b/contrib/index-prop
index a169b572644..285ad8c5890 100755
--- a/contrib/index-prop
+++ b/contrib/index-prop
@@ -14,7 +14,8 @@ while (<>)
       for (1..7)
 	{
 	  $_ = <>;
-	  s/ [^\t]+\t/ $full\t/;
+	  s/^--- [^\t]+\t/--- $full\t/;
+          s/^\+\+\+ [^\t]+\t/\+\+\+ $full\t/;
 	  print;
 	}
     }