diff --git a/.cvsignore b/.cvsignore
index 594e021..1b061b4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
-bash-2.05b.tar.bz2
+bash-3.0.tar.gz
 bash-completion-20020220.tar.gz
-bash-doc-2.05b.tar.bz2
+bash-doc-3.0.tar.gz
diff --git a/bash-2.03-paths.patch b/bash-2.03-paths.patch
index 65d67af..735a381 100644
--- a/bash-2.03-paths.patch
+++ b/bash-2.03-paths.patch
@@ -1,21 +1,21 @@
---- bash-2.03/config.h.in.paths	Thu Feb 18 11:48:31 1999
-+++ bash-2.03/config.h.in	Mon Feb 22 14:32:04 1999
-@@ -351,7 +351,7 @@
+--- bash-3.0/config.h.in.paths	2004-07-21 21:08:31.000000000 +0100
++++ bash-3.0/config.h.in	2004-07-28 09:16:27.257884999 +0100
+@@ -197,7 +197,7 @@
  
- #undef HAVE_POSIX_SIGSETJMP
+ /* System paths */
  
 -#define DEFAULT_MAIL_DIRECTORY "/usr/spool/mail"
 +#define DEFAULT_MAIL_DIRECTORY "/var/spool/mail"
  
- /* Define if you have the bcopy function.  */
- #undef HAVE_BCOPY
---- bash-2.03/config-top.h.paths	Tue Dec 15 13:24:38 1998
-+++ bash-2.03/config-top.h	Mon Feb 22 14:35:03 1999
-@@ -34,14 +34,14 @@
+ /* Characteristics of the system's header files and libraries that affect
+    the compilation environment. */
+--- bash-3.0/config-top.h.paths	2003-08-05 15:36:12.000000000 +0100
++++ bash-3.0/config-top.h	2004-07-28 09:36:27.117205637 +0100
+@@ -52,14 +52,14 @@
  /* The default value of the PATH variable. */
  #ifndef DEFAULT_PATH_VALUE
  #define DEFAULT_PATH_VALUE \
--  "/usr/gnu/bin:/usr/local/bin:/usr/ucb:/bin:/usr/bin:."
+-  "/usr/gnu/bin:/usr/local/bin:/bin:/usr/bin:."
 +  "/usr/local/bin:/bin:/usr/bin"
  #endif
  
@@ -23,7 +23,7 @@
     the Posix.2 confstr () function, or CS_PATH define are not present. */
  #ifndef STANDARD_UTILS_PATH
  #define STANDARD_UTILS_PATH \
--  "/bin:/usr/bin:/usr/ucb:/sbin:/usr/sbin:/etc:/usr/etc"
+-  "/bin:/usr/bin:/sbin:/usr/sbin:/etc:/usr/etc"
 +  "/bin:/usr/bin:/usr/sbin:/sbin"
  #endif
  
diff --git a/bash-2.05a-interpreter.patch b/bash-2.05a-interpreter.patch
index 531a071..3630805 100644
--- a/bash-2.05a-interpreter.patch
+++ b/bash-2.05a-interpreter.patch
@@ -1,6 +1,6 @@
---- bash-2.05b/config.h.in.interpreter	2002-07-22 12:30:53.000000000 +0200
-+++ bash-2.05b/config.h.in	2002-07-22 12:30:54.000000000 +0200
-@@ -579,6 +579,9 @@
+--- bash-3.0/config.h.in.interpreter	2004-07-28 09:40:15.259722811 +0100
++++ bash-3.0/config.h.in	2004-07-28 09:40:15.429690416 +0100
+@@ -601,6 +601,9 @@
  /* Define if you have the pathconf function. */
  #undef HAVE_PATHCONF
  
@@ -10,7 +10,7 @@
  /* Define if you have the putenv function.  */
  #undef HAVE_PUTENV
  
-@@ -722,6 +725,9 @@
+@@ -756,6 +759,9 @@
  /* Define if you have the <dlfcn.h> header file.  */
  #undef HAVE_DLFCN_H
  
@@ -20,28 +20,28 @@
  /* Define if you have the <grp.h> header file.  */
  #undef HAVE_GRP_H
  
---- bash-2.05b/configure.in.interpreter	2002-07-16 15:31:25.000000000 +0200
-+++ bash-2.05b/configure.in	2002-07-22 12:30:54.000000000 +0200
-@@ -525,7 +525,7 @@
+--- bash-3.0/configure.in.interpreter	2004-07-21 21:06:54.000000000 +0100
++++ bash-3.0/configure.in	2004-07-28 09:43:21.657196239 +0100
+@@ -573,7 +573,7 @@
  
  AC_CHECK_HEADERS(unistd.h stdlib.h stdarg.h varargs.h limits.h string.h \
  		 memory.h locale.h termcap.h termio.h termios.h dlfcn.h \
--		 stddef.h stdint.h netdb.h grp.h strings.h)
-+		 stddef.h stdint.h netdb.h grp.h strings.h elf.h)
+-		 stddef.h stdint.h netdb.h grp.h strings.h regex.h)
++		 stddef.h stdint.h netdb.h grp.h strings.h regex.h elf.h)
  AC_CHECK_HEADERS(sys/ptem.h sys/pte.h sys/stream.h sys/select.h sys/file.h \
- 		 sys/resource.h sys/param.h sys/socket.h \
- 		 sys/time.h sys/times.h sys/wait.h)
-@@ -588,7 +588,7 @@
- 		setlinebuf setvbuf setlocale strchr tcgetattr uname \
- 		ulimit tzset siginterrupt memmove ttyname times \
- 		getaddrinfo gethostbyname getservbyname getservent inet_aton \
--		vsnprintf snprintf vasprintf asprintf fnmatch)
-+		vsnprintf snprintf vasprintf asprintf fnmatch pread)
- AC_CHECK_FUNCS(isascii isblank isgraph isprint isspace isxdigit)
- AC_REPLACE_FUNCS(getcwd strcasecmp strerror strftime strpbrk memset)
- AC_REPLACE_FUNCS(strtod strtol strtoul strtoll strtoull strtoimax strtoumax)
---- bash-2.05b/execute_cmd.c.interpreter	2002-07-22 12:30:54.000000000 +0200
-+++ bash-2.05b/execute_cmd.c	2002-07-22 12:40:08.000000000 +0200
+ 		 sys/resource.h sys/param.h sys/socket.h sys/stat.h \
+ 		 sys/time.h sys/times.h sys/types.h sys/wait.h)
+@@ -628,7 +628,7 @@
+ AC_CHECK_FUNCS(dup2 select getdtablesize getgroups gethostname \
+ 		setdtablesize getpagesize killpg lstat getpeername sbrk \
+ 		getrlimit getrusage gettimeofday waitpid tcgetpgrp \
+-		readlink)
++		readlink pread)
+ AC_REPLACE_FUNCS(rename)
+ 
+ dnl checks for c library functions
+--- bash-3.0/execute_cmd.c.interpreter	2004-07-28 09:40:15.386698610 +0100
++++ bash-3.0/execute_cmd.c	2004-07-28 09:40:15.449686605 +0100
 @@ -40,6 +40,10 @@
  #  include <unistd.h>
  #endif
@@ -53,7 +53,7 @@
  #include "posixtime.h"
  
  #if defined (HAVE_SYS_RESOURCE_H) && !defined (RLIMTYPE)
-@@ -3496,12 +3500,20 @@
+@@ -3842,12 +3846,20 @@
  	{
  	  /* The file has the execute bits set, but the kernel refuses to
  	     run it for some reason.  See why. */
@@ -74,8 +74,8 @@
 +	      close (fd);
  	      interp = getinterp (sample, sample_len, (int *)NULL);
  	      errno = i;
- 	      sys_error ("%s: %s: bad interpreter", command, interp ? interp : "");
-@@ -3509,6 +3521,136 @@
+ 	      sys_error (_("%s: %s: bad interpreter"), command, interp ? interp : "");
+@@ -3855,6 +3867,136 @@
  	      return (EX_NOEXEC);
  	    }
  #endif
diff --git a/bash.spec b/bash.spec
index 7e920e7..2842e8e 100644
--- a/bash.spec
+++ b/bash.spec
@@ -1,20 +1,20 @@
-Version: 2.05b
+Version: 3.0
 Name: bash
 Summary: The GNU Bourne Again shell (bash) version %{version}.
-Release: 44
+Release: 1
 Group: System Environment/Shells
 License: GPL
-Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{version}.tar.bz2
-Source2: ftp://ftp.gnu.org/gnu/bash/bash-doc-%{version}.tar.bz2
+Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{version}.tar.gz
+Source2: ftp://ftp.gnu.org/gnu/bash/bash-doc-%{version}.tar.gz
 Source3: dot-bashrc
 Source4: dot-bash_profile
 Source5: dot-bash_logout
 Source6: http://www.caliban.org/files/bash/bash-completion-20020220.tar.gz
 Patch0: bash-2.03-paths.patch
 Patch1: bash-2.02-security.patch
+Patch2: bash-fixes.patch
 Patch3: bash-2.03-profile.patch
 Patch5: bash-2.05a-requires.patch
-Patch6: bash-2.04-compat.patch
 Patch7: bash-2.05a-shellfunc.patch
 Patch8: bash-2.05-ia64.patch
 Patch11: bash-2.05a-loadables.patch
@@ -22,29 +22,10 @@ Patch12: bash-2.05a-interpreter.patch
 Patch15: bash-2.05b-readline-oom.patch
 Patch16: bash-2.05b-utf8.patch
 Patch17: bash-2.05b-mbinc.patch
-Patch18: ftp://ftp.gnu.org/pub/gnu/bash/bash-2.05b-patches/bash205b-001
-Patch19: ftp://ftp.gnu.org/pub/gnu/bash/bash-2.05b-patches/bash205b-002
-Patch20: ftp://ftp.gnu.org/pub/gnu/bash/bash-2.05b-patches/bash205b-003
-Patch21: ftp://ftp.gnu.org/pub/gnu/bash/bash-2.05b-patches/bash205b-004
-Patch22: bash-2.05b-locale.patch
-Patch23: bash-2.05b-readline-init.patch
-Patch24: bash-2.05b-restrict.patch
 Patch26: bash-2.05b-xcc.patch
 Patch27: bash-2.05b-pgrp_sync.patch
-Patch28: bash-2.05b-003fix.patch
-Patch29: bash-2.05b-display.patch
 Patch30: bash-2.05b-manso.patch
 Patch31: bash-2.05b-debuginfo.patch
-Patch32: bash-2.05b-warnings.patch
-Patch33: bash-2.05b-complete.patch
-Patch34: ftp://ftp.gnu.org/pub/gnu/bash/bash-2.05b-patches/bash205b-005
-Patch35: ftp://ftp.gnu.org/pub/gnu/bash/bash-2.05b-patches/bash205b-006
-Patch36: ftp://ftp.gnu.org/pub/gnu/bash/bash-2.05b-patches/bash205b-007
-Patch37: bash-2.05b-slow.patch
-Patch38: bash-2.05b-subst.patch
-Patch39: bash-2.05b-rereadline.patch
-Patch40: bash-2.05b-overread.patch
-Patch41: bash-commsubst.patch
 Patch42: bash-sigpipe.patch
 Prefix: %{_prefix}
 Requires: mktemp
@@ -71,9 +52,9 @@ popular and powerful, and you'll probably end up using it.
 %setup -q -a 2 -a 6
 %patch0 -p1 -b .paths
 %patch1 -p1 -b .security
+%patch2 -p1 -b .fixes
 %patch3 -p1 -b .profile
 %patch5 -p1 -b .requires
-%patch6 -p1 -b .compat
 %patch7 -p1 -b .shellfunc
 %patch8 -p1 -b .ia64
 %patch11 -p1 -b .loadables
@@ -81,29 +62,10 @@ popular and powerful, and you'll probably end up using it.
 %patch15 -p1 -b .readline-oom
 %patch16 -p1 -b .utf8
 %patch17 -p1 -b .mbinc
-%patch18 -p0 -b .001
-%patch19 -p0 -b .002
-%patch20 -p0 -b .003
-%patch21 -p0 -b .004
-%patch22 -p1 -b .locale
-%patch23 -p1 -b .readline-init
-%patch24 -p1 -b .restrict
 %patch26 -p1 -b .xcc
 %patch27 -p1 -b .pgrp_sync
-%patch28 -p1 -b .003fix
-%patch29 -p1 -b .display
 %patch30 -p1 -b .manso
 %patch31 -p1 -b .debuginfo
-%patch32 -p1 -b .warnings
-%patch33 -p1 -b .complete
-%patch34 -p0 -b .005
-%patch35 -p0 -b .006
-%patch36 -p0 -b .007
-%patch37 -p1 -b .slow
-%patch38 -p1 -b .subst
-%patch39 -p1 -b .rereadline
-%patch40 -p1 -b .overread
-%patch41 -p1 -b .commsubst
 %patch42 -p1 -b .sigpipe
 echo %{version} > _distribution
 echo %{release} > _patchlevel
@@ -134,7 +96,7 @@ perl -pi -e 's,bashref\.info,bash.info,' doc/bashref.info
 mkdir -p $RPM_BUILD_ROOT/etc
 
 # make manpages for bash builtins as per suggestion in DOC/README
-cd doc
+pushd doc
 sed -e '
 /^\.SH NAME/, /\\- bash built-in commands, see \\fBbash\\fR(1)$/{
 /^\.SH NAME/d
@@ -156,6 +118,7 @@ for i in `cat man.pages` ; do
   echo .so man1/builtins.1 > ${RPM_BUILD_ROOT}%{_mandir}/man1/$i.1
   chmod 0644 ${RPM_BUILD_ROOT}%{_mandir}/man1/$i.1
 done
+popd
 
 # Link bash man page to sh so that man sh works.
 ln -s bash.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/sh.1
@@ -180,6 +143,8 @@ install -c -m644 $RPM_SOURCE_DIR/dot-bash_logout \
 find $RPM_BUILD_ROOT/ $RPM_BUILD_DIR/ -name "bashbug*" \
     -exec rm -vf {} \;
 
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -224,7 +189,7 @@ if [ "$1" = 0 ]; then
     mv /etc/shells.new /etc/shells
 fi
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root)
 %doc CHANGES COMPAT NEWS NOTES POSIX
 %doc doc/FAQ doc/INTRO doc/article.ms
@@ -241,6 +206,9 @@ fi
 %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Wed Jul 28 2004 Tim Waugh <twaugh@redhat.com> 3.0-1
+- 3.0.
+
 * Wed Jul 21 2004 Tim Waugh <twaugh@redhat.com> 2.05b-44
 - Don't report SIGPIPE errors (bug #128274).
 
diff --git a/sources b/sources
index 08aa4c0..2cc3269 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-f3e5428ed52a4f536f571a945d5de95d  bash-2.05b.tar.bz2
+26c4d642e29b3533d8d754995bc277b3  bash-3.0.tar.gz
 1fb7158868b3d0486fc4611a838c2662  bash-completion-20020220.tar.gz
-a402e8df0aab99137adb8d3659feb86c  bash-doc-2.05b.tar.bz2
+1fd06916fb451a666a38e4689173b60b  bash-doc-3.0.tar.gz