diff --git a/cvs-1.11.22-diff-rm.patch b/cvs-1.11.22-diff-rm.patch
new file mode 100644
index 0000000..0f1f482
--- /dev/null
+++ b/cvs-1.11.22-diff-rm.patch
@@ -0,0 +1,12 @@
+diff -urp cvs-1.11.22/src/diff.c cvs-1.11.22mzk/src/diff.c
+--- cvs-1.11.22/src/diff.c	2007-07-30 10:35:13.000000000 +0200
++++ cvs-1.11.22mzk/src/diff.c	2007-07-30 10:27:34.000000000 +0200
+@@ -503,7 +503,7 @@ diff_fileproc (callerdat, finfo)
+     user_file_rev = 0;
+     vers = Version_TS (finfo, NULL, NULL, NULL, 1, 0);
+ 
+-    if (diff_rev2 != NULL || diff_date2 != NULL)
++    if ((diff_rev2 != NULL || diff_date2 != NULL) && strcmp(diff_rev1,TAG_BASE)!=0 && strcmp(diff_rev2,TAG_BASE)!=0)
+     {
+ 	/* Skip all the following checks regarding the user file; we're
+ 	   not using it.  */
diff --git a/cvs.spec b/cvs.spec
index e620b07..cdc2851 100644
--- a/cvs.spec
+++ b/cvs.spec
@@ -6,7 +6,7 @@
 Summary: A version control system
 Name: cvs
 Version: 1.11.22
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPL
 Group: Development/Tools
 Source0: ftp://ftp.gnu.org/non-gnu/cvs/source/stable/%{version}/cvs-%{version}.tar.bz2
@@ -43,6 +43,7 @@ Patch14: cvs-1.11.21-diff-kk.patch
 Patch15: cvs-1.11.21-sort.patch
 Patch16: cvs-1.11.22-free.patch
 Patch17: cvs-1.11.22-ipv6-proxy.patch
+Patch18: cvs-1.11.22-diff-rm.patch
 
 
 %description
@@ -82,6 +83,7 @@ release.
 %patch15 -p1 -b .env
 %patch16 -p1 -b .free
 %patch17 -p1 -b .ipv6
+%patch18 -p1 -b .diff-rm
 
 # Apply a patch to the generated files, OR
 # run autoreconf and require autoconf >= 2.58, automake >= 1.7.9
@@ -159,6 +161,10 @@ exit 0
 %{_sysconfdir}/profile.d/*
 
 %changelog
+* Mon Jul 30 2007 Jiri Moskovcak <jmoskovc@redhat.com> - 1.11.22-11
+- fix diff on removed file when "-r BASE" tag is used
+- Resolves: #242049
+
 * Fri Jun 15 2007 Stepan Kasal <skasal@redhat.com> - 1.11.22-10
 - make sccs2rcs non-executable, so that find-requires does not add
   dependency on /bin/csh when /bin/csh is available