diff --git a/cvsps-2.2b1-diff-opts.patch b/cvsps-2.2b1-diff-opts.patch
deleted file mode 100644
index d493cce..0000000
--- a/cvsps-2.2b1-diff-opts.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up cvsps-2.2b1/cvsps.1.orig cvsps-2.2b1/cvsps.1
---- cvsps-2.2b1/cvsps.1.orig	2009-12-22 21:16:20.000000000 +0200
-+++ cvsps-2.2b1/cvsps.1	2009-12-22 21:16:25.000000000 +0200
-@@ -83,7 +83,7 @@ some hacks which are not generally appli
- disable the use of rlog internally.  Note: rlog is
- required for stable PatchSet numbering.  Use with care.
- .TP
--.B \-\-diffs\-opts <option string>
-+.B \-\-diff\-opts <option string>
- send a custom set of options to diff, for example to increase
- the number of context lines, or change the diff format.
- .TP
diff --git a/cvsps-2.2b1-man.patch b/cvsps-2.2b1-man.patch
new file mode 100644
index 0000000..3e6816f
--- /dev/null
+++ b/cvsps-2.2b1-man.patch
@@ -0,0 +1,29 @@
+diff -up cvsps-2.2b1/cvsps.1~ cvsps-2.2b1/cvsps.1
+--- cvsps-2.2b1/cvsps.1~	2008-04-02 04:18:44.000000000 +0300
++++ cvsps-2.2b1/cvsps.1	2010-05-18 21:10:39.000000000 +0300
+@@ -11,7 +11,7 @@ to a collection of files, and all commit
+ single 'cvs commit' command).  This information is valuable to seeing the
+ big picture of the evolution of a cvs project.  While cvs tracks revision
+ information, it is often difficult to see what changes were committed
+-'atomically' to the repository.
++\'atomically' to the repository.
+ .SH OPTIONS
+ .TP
+ .B \-h
+@@ -83,7 +83,7 @@ some hacks which are not generally appli
+ disable the use of rlog internally.  Note: rlog is
+ required for stable PatchSet numbering.  Use with care.
+ .TP
+-.B \-\-diffs\-opts <option string>
++.B \-\-diff\-opts <option string>
+ send a custom set of options to diff, for example to increase
+ the number of context lines, or change the diff format.
+ .TP
+@@ -103,6 +103,7 @@ Override the setting of CVSROOT (overrid
+ .TP
+ .B \-q
+ Be quiet about warnings.
++.TP
+ .B \-A
+ Show ancestor branch when a new branch is found.
+ .TP
diff --git a/cvsps.spec b/cvsps.spec
index e869de4..b5fb3f7 100644
--- a/cvsps.spec
+++ b/cvsps.spec
@@ -2,7 +2,7 @@
 
 Name:           cvsps
 Version:        2.2
-Release:        0.5.%{prever}%{?dist}
+Release:        0.6.%{prever}%{?dist}
 Summary:        Patchset tool for CVS
 
 Group:          Development/Tools
@@ -11,7 +11,7 @@ URL:            http://www.cobite.com/cvsps/
 Source0:        http://www.cobite.com/cvsps/%{name}-%{version}%{prever}.tar.gz
 # https://bugzilla.redhat.com/516083
 Patch0:         %{name}-2.2b1-dynamic-logbuf.patch
-Patch1:         %{name}-2.2b1-diff-opts.patch
+Patch1:         %{name}-2.2b1-man.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue May 18 2010 Ville Skyttä <ville.skytta@iki.fi> - 2.2-0.6.b1
+- Patch to fix man page formatting errors.
+
 * Tue Dec 22 2009 Ville Skyttä <ville.skytta@iki.fi> - 2.2-0.5.b1
 - Build with -DLINUX to fix --cvs-direct on 64-bit platforms (#539765).
 - Use patch instead of sed for man page fixes.