diff --git a/bash-completion-1.2-sudo-filedir-652555.patch b/bash-completion-1.2-sudo-filedir-652555.patch
index 5a161cf..682e7dc 100644
--- a/bash-completion-1.2-sudo-filedir-652555.patch
+++ b/bash-completion-1.2-sudo-filedir-652555.patch
@@ -45,7 +45,7 @@ diff -up bash-completion-1.2/bash_completion~ bash-completion-1.2/bash_completio
 -            }
 +            # Turn on -o filenames; see http://bugs.debian.org/272660#64 for
 +            # info about the compgen hack (bash < 4)
-+            compopt -o filenames 2>/dev/null || \
++            type compopt &>/dev/null && compopt -o filenames 2>/dev/null || \
 +                compgen -f /non-existing-dir/ >/dev/null
          fi
      fi
diff --git a/bash-completion.spec b/bash-completion.spec
index 375b0e0..e9a60d9 100644
--- a/bash-completion.spec
+++ b/bash-completion.spec
@@ -3,7 +3,7 @@
 
 Name:           bash-completion
 Version:        1.2
-Release:        4%{?dist}.1
+Release:        4%{?dist}.2
 Epoch:          1
 Summary:        Programmable completion for Bash
 
@@ -20,7 +20,7 @@ Patch1:         %{name}-1.2-tilde-username-628130.patch
 Patch2:         %{name}-1.2-rpm-630328.patch
 # From upstream post-1.2 git, #630658
 Patch3:         %{name}-1.2-known_hosts-ipv6-630658.patch
-# From upstream post-1.2 git, #652555
+# From upstream post-1.2 git, #652555, #653669
 Patch4:         %{name}-1.2-sudo-filedir-652555.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -366,6 +366,9 @@ fi
 
 
 %changelog
+* Tue Nov 16 2010 Ville Skyttä <ville.skytta@iki.fi> - 1:1.2-4.2
+- Apply upstreamed fix for spurious terminal echo off on bash < 4, #653669.
+
 * Fri Nov 12 2010 Ville Skyttä <ville.skytta@iki.fi> - 1:1.2-4.1
 - Apply upstream _filedir bash < 4 fix for #652555.