diff --git a/bash-bashbug.patch b/bash-bashbug.patch
new file mode 100644
index 0000000..c32da57
--- /dev/null
+++ b/bash-bashbug.patch
@@ -0,0 +1,53 @@
+--- bash-3.0/doc/bash.1.bashbug	2004-09-07 18:12:05.102185374 +0100
++++ bash-3.0/doc/bash.1	2004-09-07 18:15:12.796455678 +0100
+@@ -8680,7 +8680,7 @@
+ .PP
+ Once you have determined that a bug actually exists, use the
+ .I bashbug
+-command to submit a bug report.
++command (from the source package) to submit a bug report.
+ If you have a fix, you are encouraged to mail that as well!
+ Suggestions and `philosophical' bug reports may be mailed
+ to \fIbug-bash@gnu.org\fP or posted to the Usenet
+@@ -8702,10 +8702,6 @@
+ A short script or `recipe' which exercises the bug
+ .PD
+ .PP
+-.I bashbug
+-inserts the first three items automatically into the template
+-it provides for filing a bug report.
+-.PP
+ Comments and bug reports concerning
+ this manual page should be directed to
+ .IR chet@po.CWRU.Edu .
+--- bash-3.0/doc/bashref.texi.bashbug	2004-09-07 18:13:53.305588178 +0100
++++ bash-3.0/doc/bashref.texi	2004-09-07 18:14:58.111251326 +0100
+@@ -6777,7 +6777,7 @@
+ @uref{ftp://ftp.gnu.org/pub/bash/}.
+ 
+ Once you have determined that a bug actually exists, use the
+-@code{bashbug} command to submit a bug report.
++@code{bashbug} command (from the source package) to submit a bug report.
+ If you have a fix, you are encouraged to mail that as well!
+ Suggestions and `philosophical' bug reports may be mailed
+ to @email{bug-bash@@gnu.org} or posted to the Usenet
+@@ -6799,9 +6799,6 @@
+ @end itemize
+ 
+ @noindent
+-@code{bashbug} inserts the first three items automatically into
+-the template it provides for filing a bug report.
+-
+ Please send all reports concerning this manual to
+ @email{chet@@po.CWRU.Edu}.
+ 
+--- bash-3.0/shell.c.bashbug	2004-09-07 18:11:10.580563335 +0100
++++ bash-3.0/shell.c	2004-09-07 18:11:23.650075642 +0100
+@@ -1763,7 +1763,6 @@
+     {
+       fprintf (fp, _("Type `%s -c \"help set\"' for more information about shell options.\n"), shell_name);
+       fprintf (fp, _("Type `%s -c help' for more information about shell builtin commands.\n"), shell_name);
+-      fprintf (fp, _("Use the `bashbug' command to report bugs.\n"));
+     }
+ }
+ 
diff --git a/bash.spec b/bash.spec
index 9dc7022..e89889d 100644
--- a/bash.spec
+++ b/bash.spec
@@ -1,7 +1,7 @@
 Version: 3.0
 Name: bash
 Summary: The GNU Bourne Again shell (bash) version %{version}.
-Release: 11
+Release: 13
 Group: System Environment/Shells
 License: GPL
 Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{version}.tar.gz
@@ -32,6 +32,8 @@ Patch19: bash-multibyteifs.patch
 Patch20: bash-history.patch
 Patch21: bash-ulimit.patch
 Patch22: bash-mbslen.patch
+Patch23: bash-bashbug.patch
+Patch24: bash-jobs.patch
 Patch26: bash-2.05b-xcc.patch
 Patch27: bash-2.05b-pgrp_sync.patch
 Patch30: bash-2.05b-manso.patch
@@ -83,6 +85,8 @@ popular and powerful, and you'll probably end up using it.
 %patch20 -p1 -b .history
 %patch21 -p1 -b .ulimit
 %patch22 -p1 -b .mbslen
+%patch23 -p1 -b .bashbug
+%patch24 -p1 -b .jobs
 %patch26 -p1 -b .xcc
 %patch27 -p1 -b .pgrp_sync
 %patch30 -p1 -b .manso
@@ -99,6 +103,7 @@ if ! autoconf; then
 fi
 %configure --with-bash-malloc=no --with-afs
 make CPPFLAGS=`getconf LFS_CFLAGS`
+make -C doc
 make check
 
 %install
@@ -227,6 +232,16 @@ fi
 %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Wed Sep  8 2004 Tim Waugh <twaugh@redhat.com> 3.0-13
+- Check for EINVAL from waitpid() and avoid WCONTINUED in that case.
+- Fixed jobs4 test.
+- Applied experimental upstream patch for trap compatibility.
+- Re-make documentation to reflect source changes.
+
+* Tue Sep  7 2004 Tim Waugh <twaugh@redhat.com> 3.0-12
+- Remove 'bashbug' from the documentation, because we don't ship it due
+  to biarch concerns.
+
 * Thu Sep  2 2004 Tim Waugh <twaugh@redhat.com> 3.0-11
 - Fixed multibyte parameter length expansion.