diff --git a/src/ChangeLog b/src/ChangeLog
index f0f2733df7d0a6b2147d4e7d7541479e61fa6ee9..a61090b9b10ba7870d2aac2d8a157acca2f650e6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2008-11-05  Mark D. Baushke  <mdb@gnu.org>
 
+	* sanity.sh (keyword-25): Fix merge from cvs 1.11.x problem.
+
 	*diff.c (diff): Use SEND_FORCE on files when a -k option is used
 	with diff to avoid client/server not finding the requested file.
 	* sanity.sh (keyword): Add tests for this.
diff --git a/src/sanity.sh b/src/sanity.sh
index 9478818e7542a0f1d8dee077e1a4e3c7707cdfc6..895fbe5198b3afbd8e72958917b7dccc361fd0c2 100755
--- a/src/sanity.sh
+++ b/src/sanity.sh
@@ -26541,11 +26541,7 @@ xx "'\$'"Log"'\$'
 change"
 
 	  dotest_fail keyword-25 "${testcvs} diff -kk file1" \
-"Index: file1
-===================================================================
-RCS file: ${CVSROOT_DIRNAME}/first-dir/file1,v
-retrieving revision 1\.3
-diff -r1\.3 file1
+"diff -r1\.3 file1
 1c1
 < \$Name\$
 ---