diff --git a/bash-3.2-patches.tar.bz2 b/bash-3.2-patches.tar.bz2
index 8b5c5fba..6d6138cc 100644
--- a/bash-3.2-patches.tar.bz2
+++ b/bash-3.2-patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5db45390290cfaf509e50bc727489bce9164b5460183f2d4238203c9c41dd91e
-size 13698
+oid sha256:4ca85ba0057645156e357631f3821b9d22f3181210246e134cb6c44eaa19ceae
+size 19197
diff --git a/bash.changes b/bash.changes
index 572dc471..400764a9 100644
--- a/bash.changes
+++ b/bash.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Aug 27 01:30:00 CEST 2007 - schwab@suse.de
+
+- Add bash patches 18-25.
+
 -------------------------------------------------------------------
 Sat Aug 11 14:25:14 CEST 2007 - schwab@suse.de
 
diff --git a/bash.spec b/bash.spec
index 43a172e7..7270b8fd 100644
--- a/bash.spec
+++ b/bash.spec
@@ -21,7 +21,7 @@ Requires:       /%{_lib}/libreadline.so.%{rl_vers}
 Recommends:     bash-doc = %bash_vers
 Autoreqprov:    on
 Version:        3.2
-Release:        49
+Release:        54
 Summary:        The GNU Bourne-Again Shell
 URL:            http://www.gnu.org/software/bash/bash.html
 Source0:        bash-%{bash_vers}.tar.bz2
@@ -68,7 +68,7 @@ Summary:        Documentation how to Use the GNU Bourne-Again Shell
 Group:          Documentation/Man
 Provides:       bash:/usr/share/info/bash.info.gz
 Version:        3.2
-Release:        8
+Release:        13
 Autoreqprov:    on
 
 %description -n bash-doc
@@ -87,7 +87,7 @@ Summary:        The Readline Library
 Group:          System/Libraries
 Provides:       bash:/%{_lib}/libreadline.so.5
 Version:        5.2
-Release:        8
+Release:        13
 Recommends:     readline-doc = %{version}
 Provides:       readline =  5.2
 Obsoletes:      readline <= 5.2
@@ -110,7 +110,7 @@ Summary:        Include Files and Libraries mandatory for Development.
 Group:          Development/Libraries/C and C++
 Provides:       bash:/usr/%{_lib}/libreadline.a
 Version:        5.2
-Release:        49
+Release:        54
 Requires:       libreadline5 = %{version}
 Requires:       ncurses-devel
 Requires:       /%{_lib}/libhistory.so.%{rl_vers}
@@ -134,7 +134,7 @@ Summary:        Documentation how to Use and Programm with the Readline Library
 Group:          System/Libraries
 Provides:       readline:/usr/share/info/readline.info.gz
 Version:        5.2
-Release:        8
+Release:        13
 Autoreqprov:    on
 
 %description -n readline-doc
@@ -171,7 +171,7 @@ unset p
 for p in ../readline-%{rl_vers}-patches/*; do
     test -e $p || break
     case "${p##*/}" in
-    readline52-00[1234])
+    readline52-00[1234567])
 	echo Patch ${p##*/} already part of bash32-006
 	continue
 	;;
@@ -396,6 +396,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_defaultdocdir}/readline/
 
 %changelog
+* Mon Aug 27 2007 - schwab@suse.de
+- Add bash patches 18-25.
 * Sat Aug 11 2007 - schwab@suse.de
 - Add bash patches 10-17.
 * Sat Aug 04 2007 - dmueller@suse.de
diff --git a/readline-5.2-patches.tar.bz2 b/readline-5.2-patches.tar.bz2
index 50e98612..947a3b20 100644
--- a/readline-5.2-patches.tar.bz2
+++ b/readline-5.2-patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3694b63750ac3c322d2efb0c2dd8d3687b9d9b9afb3c7f10a4c5ee64c27a1147
-size 2354
+oid sha256:1dd9deec85d347e69bb8e18cf84d01f693f8f8f343b1cc71feb37f09dad44886
+size 5371
diff --git a/readline-5.2.dif b/readline-5.2.dif
index dbf79da5..da72cc7d 100644
--- a/readline-5.2.dif
+++ b/readline-5.2.dif
@@ -30,15 +30,6 @@
  uninstall-doc:
 --- complete.c
 +++ complete.c	2005-12-09 17:11:19.000000000 +0100
-@@ -428,7 +428,7 @@ get_y_or_n (for_pager)
- 	return (1);
-       if (c == 'n' || c == 'N' || c == RUBOUT)
- 	return (0);
--      if (c == ABORT_CHAR)
-+      if (c == ABORT_CHAR || c == EOF)
- 	_rl_abort_internal ();
-       if (for_pager && (c == NEWLINE || c == RETURN))
- 	return (2);
 @@ -883,7 +883,7 @@ _rl_find_completion_word (fp, dp)
        /* We didn't find an unclosed quoted substring upon which to do
           completion, so use the word break characters to find the