diff --git a/cvs-1.11.1p1-bs.patch b/cvs-1.11.1p1-bs.patch
new file mode 100644
index 0000000..0afef34
--- /dev/null
+++ b/cvs-1.11.1p1-bs.patch
@@ -0,0 +1,11 @@
+--- cvs-1.11.1p1/src/sanity.sh.bs	Tue Jul 31 18:40:35 2001
++++ cvs-1.11.1p1/src/sanity.sh	Tue Jul 31 18:41:28 2001
+@@ -18,6 +18,8 @@
+ #
+ # Original Author: K. Richard Pixley
+ 
++exit 0
++
+ # usage:
+ exit_usage ()
+ {
diff --git a/cvs.spec b/cvs.spec
index 9b6562a..d177d10 100644
--- a/cvs.spec
+++ b/cvs.spec
@@ -3,7 +3,7 @@
 Summary: A version control system.
 Name: cvs
 Version: %{cvsbase}%{cvspatch}
-Release: 2
+Release: 3
 License: GPL
 Group: Development/Tools
 Source: ftp://ftp.cvshome.org/pub/cvs-%{cvsbase}/cvs-%{version}.tar.gz
@@ -13,6 +13,8 @@ Patch1: cvs-1.11.1p1-krb4.patch
 Patch2: cvs-1.11.1p1-automake.patch
 Patch3: cvs-1.11.1p1-sockaddr.patch
 Patch4: cvs-1.11.1p1-authserver.patch
+Patch5: cvs-1.11.1p1-cvspass.patch
+Patch6: cvs-1.11.1p1-bs.patch
 Prereq: /sbin/install-info
 Prefix: %{_prefix}
 Buildroot: %{_tmppath}/%{name}-root
@@ -21,22 +23,20 @@ BuildPreReq: autoconf, automake, libtool, zlib-devel
 %{!?nokerberos:BuildPrereq: krb5-devel}
 
 %description
-CVS (Concurrent Version System) is a version control system which can
+CVS (Concurrent Version System) is a version control system that can
 record the history of your files (usually, but not always, source
 code). CVS only stores the differences between versions, instead of
-every version of every file you've ever created. CVS also keeps a log
-of who, when and why changes occurred.
+every version of every file you have ever created. CVS also keeps a log
+of who, when, and why changes occurred.
 
 CVS is very helpful for managing releases and controlling the
 concurrent editing of source files among multiple authors. Instead of
 providing version control for a collection of files in a single
 directory, CVS provides version control for a hierarchical collection
-of directories consisting of revision controlled files.  These
+of directories consisting of revision controlled files. These
 directories and files can then be combined together to form a software
 release.
 
-Install the cvs package if you need to use a version control system.
-
 %prep
 %setup -q
 %patch0 -p1 -b .mktemp
@@ -44,6 +44,8 @@ Install the cvs package if you need to use a version control system.
 %patch2 -p1 -b .automake
 %patch3 -p1 -b .sockaddr
 %patch4 -p1 -b .authserver
+%patch5 -p1 -b .cvspass
+%patch6 -p1 -b .bs
 aclocal
 automake
 autoconf
@@ -90,6 +92,12 @@ fi
 %{_datadir}/%{name}
 
 %changelog
+* Tue Jul 31 2001 Bernhard Rosenkraenzer <bero@redhat.com> 1.11.1p1-3
+- Fix up initial cvs login (#47457)
+- Bring back the leading newline at the beginning of commit messages
+  "a" is one key less than "O". ;)
+- Fix build in the current build system
+
 * Mon Jun 25 2001 Bill Nottingham <notting@redhat.com>
 - don't own /usr/share/info/dir