diff --git a/BZ-809469-completion-helper.patch b/BZ-809469-completion-helper.patch
new file mode 100644
index 0000000..d98652a
--- /dev/null
+++ b/BZ-809469-completion-helper.patch
@@ -0,0 +1,68 @@
+diff --git a/completion-helper.py b/completion-helper.py
+index 405ceab..71de058 100755
+--- a/completion-helper.py
++++ b/completion-helper.py
+@@ -69,6 +69,8 @@ def get_pattern(extcmds):
+ 
+ def main(args):
+     base = cli.YumBaseCli()
++    # We want the default cachedir but commit 0f034091 does not.
++    base.setCacheDir = lambda *x: True # monkeypatch
+     base.yum_cli_commands.clear()
+     base.registerCommand(GroupsCompletionCommand())
+     base.registerCommand(ListCompletionCommand())
+commit 6351d7bbb6957e7c739a674696fcc5d7d31ecb17
+Author: Zdeněk Pavlas <zpavlas@redhat.com>
+Date:   Wed Apr 4 13:36:36 2012 +0200
+
+    completion-helper: skip unavailable repos.  BZ 809469.
+    
+    completion-helper uses --cacheonly option to avoid metadata
+    download, so new (or cleaned up) repos raise exceptions.
+    
+    We work this around by setting skip_if_unavailable=1 on all
+    enabled repositories.
+
+diff --git a/completion-helper.py b/completion-helper.py
+index e4164f7..2e95ced 100755
+--- a/completion-helper.py
++++ b/completion-helper.py
+@@ -74,6 +74,8 @@ def main(args):
+     base.registerCommand(RepoListCompletionCommand())
+     base.getOptionsConfig(args)
+     base.parseCommands()
++    for repo in base.repos.listEnabled():
++        repo.skip_if_unavailable = True
+     base.doCommands()
+ 
+ if __name__ == "__main__":
+commit 6d8a99b413698b117b787fb8d69abeba4fbe7826
+Author: Zdeněk Pavlas <zpavlas@redhat.com>
+Date:   Thu Apr 5 11:08:08 2012 +0200
+
+    completion_helper: catch GroupsError.  BZ 806844.
+
+diff --git a/completion-helper.py b/completion-helper.py
+index 2e95ced..405ceab 100755
+--- a/completion-helper.py
++++ b/completion-helper.py
+@@ -23,6 +23,7 @@ import sys
+ 
+ import cli
+ import yumcommands
++from yum.Errors import GroupsError
+ 
+ 
+ class GroupsCompletionCommand(yumcommands.GroupsCommand):
+@@ -76,7 +77,10 @@ def main(args):
+     base.parseCommands()
+     for repo in base.repos.listEnabled():
+         repo.skip_if_unavailable = True
+-    base.doCommands()
++    try:
++        base.doCommands()
++    except GroupsError, e:
++        base.logger.error(e)
+ 
+ if __name__ == "__main__":
+     try:
diff --git a/yum.spec b/yum.spec
index 639ca18..d4cc3f5 100644
--- a/yum.spec
+++ b/yum.spec
@@ -18,7 +18,7 @@
 Summary: RPM package installer/updater/manager
 Name: yum
 Version: 3.4.3
-Release: 24%{?dist}
+Release: 25%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://yum.baseurl.org/download/3.4/%{name}-%{version}.tar.gz
@@ -32,6 +32,7 @@ Patch7: yum-ppc64-preferred.patch
 Patch8: BZ-803346-no-only-update.patch
 Patch9: arm-arch-detection.patch
 Patch20: yum-manpage-files.patch
+Patch21: BZ-809469-completion-helper.patch
 
 URL: http://yum.baseurl.org/
 BuildArchitectures: noarch
@@ -141,6 +142,7 @@ Install this package if you want auto yum updates nightly via cron.
 %patch8 -p1
 %patch9 -p1
 %patch20 -p1
+%patch21 -p1
 %patch1 -p1
 
 %build
@@ -315,6 +317,9 @@ exit 0
 %endif
 
 %changelog
+* Thu May 31 2012 Zdenek Pavlas <zpavlas at redhat.com> - 3.4.3-25
+- backported completion-helper.py patches from HEAD, BZ 809469.
+
 * Fri Apr 27 2012 James Antill <james at fedoraproject.org> - 3.4.3-24
 - Add code for arm detection.