diff --git a/bash-completion-20050721-bash31quoting.patch b/bash-completion-20050721-bash31quoting.patch
new file mode 100644
index 0000000..b031404
--- /dev/null
+++ b/bash-completion-20050721-bash31quoting.patch
@@ -0,0 +1,38 @@
+--- bash_completion/bash_completion~	2005-07-21 22:21:22.000000000 +0300
++++ bash_completion/bash_completion	2006-01-08 17:31:57.000000000 +0200
+@@ -661,4 +661,4 @@
+ 			COMPREPLY=( $( compgen -W "$( echo $( smbclient -d 0 -NL $host |
+-			sed -ne '/^['$'\t '']*Sharename/,/^$/p' |
+-			sed -ne '3,$s|^[^A-Za-z]*\([^'$'\t '']*\).*$|//'$host'/\1|p' ) )" -- "$cur" ) )
++			sed -ne '/^[\t ]*Sharename/,/^$/p' |
++			sed -ne '3,$s|^[^A-Za-z]*\([^\t ]*\).*$|//'$host'/\1|p' ) )" -- "$cur" ) )
+ 		fi
+@@ -2398,5 +2398,5 @@
+ 	    # expand path (if present) to global known hosts file
+-	    global_kh=$( eval echo $( sed -ne 's/^[Gg][Ll][Oo][Bb][Aa][Ll][Kk][Nn][Oo][Ww][Nn][Hh][Oo][Ss][Tt][Ss][Ff][Ii][Ll][Ee]['$'\t '']*\(.*\)$/\1/p' ${config[@]} ) )
++	    global_kh=$( eval echo $( sed -ne 's/^[Gg][Ll][Oo][Bb][Aa][Ll][Kk][Nn][Oo][Ww][Nn][Hh][Oo][Ss][Tt][Ss][Ff][Ii][Ll][Ee][\t ]*\(.*\)$/\1/p' ${config[@]} ) )
+ 	    # expand path (if present) to user known hosts file
+-	    user_kh=$( eval echo $( sed -ne 's/^[Uu][Ss][Ee][Rr][Kk][Nn][Oo][Ww][Nn][Hh][Oo][Ss][Tt][Ss][Ff][Ii][Ll][Ee]['$'\t '']*\(.*\)$/\1/p' ${config[@]} ) )
++	    user_kh=$( eval echo $( sed -ne 's/^[Uu][Ss][Ee][Rr][Kk][Nn][Oo][Ww][Nn][Hh][Oo][Ss][Tt][Ss][Ff][Ii][Ll][Ee][\t ]*\(.*\)$/\1/p' ${config[@]} ) )
+ 	fi
+@@ -2476,3 +2476,3 @@
+ 	    if [ ${#config[@]} -gt 0 ] && [ -n "$aliases" ]; then
+-		hosts=$( compgen -W "$( sed -ne "s/^[Hh][Oo][Ss][Tt]["$'\t '"]*\([^*?]*\)$/\1/p" ${config[@]} )" -- $ocur )
++		hosts=$( compgen -W '$( sed -ne "s/^[Hh][Oo][Ss][Tt][\t ]*\([^*?]*\)$/\1/p" ${config[@]} )' -- $ocur )
+ 		COMPREPLY=( ${COMPREPLY[@]} $hosts )
+@@ -5860,3 +5860,3 @@
+ 	dict $host $port $1 2>/dev/null | sed -ne \
+-	    's/^['$'\t '']['$'\t '']*\([^'$'\t '']*\).*$/\1/p'
++	    's/^[\t ][\t ]*\([^\t ]*\).*$/\1/p'
+ }
+--- bash_completion/contrib/sitecopy~	2005-01-03 04:44:22.000000000 +0200
++++ bash_completion/contrib/sitecopy	2006-01-08 17:35:19.000000000 +0200
+@@ -20,7 +20,7 @@
+ 		;;
+ 	    *)
+ 		if [ -r ~/.sitecopyrc ]; then
+-		    COMPREPLY=( $( compgen -W "$(grep '^["$'\t '"]*site'  ~/.sitecopyrc | awk '{print $2}')" -- $cur ) )
++		    COMPREPLY=( $( compgen -W "$(grep '^[\t ]*site'  ~/.sitecopyrc | awk '{print $2}')" -- $cur ) )
+ 		fi
+ 		;;
+ 	esac
diff --git a/bash-completion.spec b/bash-completion.spec
index 8374cc2..63aaf1e 100644
--- a/bash-completion.spec
+++ b/bash-completion.spec
@@ -1,6 +1,6 @@
 Name:           bash-completion
 Version:        20050721
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Programmable completion for Bash
 
 Group:          System Environment/Shells
@@ -12,6 +12,7 @@ Source2:        %{name}-mock
 Source3:        %{name}-repomanage
 Source4:        %{name}-plague-client
 Patch0:         %{name}-20050721-cvs-stat.patch
+Patch1:         %{name}-20050721-bash31quoting.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -25,6 +26,7 @@ of the programmable completion feature of bash 2.
 %prep
 %setup -q -n bash_completion
 %patch0
+%patch1 -p1
 install -pm 644 %{SOURCE2} contrib/mock
 install -pm 644 %{SOURCE3} contrib/plague-client
 install -pm 644 %{SOURCE3} contrib/repomanage
@@ -88,6 +90,9 @@ fi\
 
 
 %changelog
+* Sun Jan  8 2006 Ville Skyttä <ville.skytta at iki.fi> - 20050721-3
+- Patch to hopefully fix quoting problems with bash 3.1 (#177056).
+
 * Mon Nov 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 20050721-2
 - Work around potential login problem in profile.d snippet (#174355).