diff --git a/python-base.changes b/python-base.changes
index 161d77f..bd9fb1b 100644
--- a/python-base.changes
+++ b/python-base.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Aug  3 18:43:32 UTC 2012 - dimstar@opensuse.org
+
+- Add python-bundle-lang.patch: gettext: If bindtextdomain is
+  instructed to look in the default location of translations, we
+  check additionally in locale-bundle. Fixes issues like bnc#617751
+
 -------------------------------------------------------------------
 Tue Jul 31 12:36:04 UTC 2012 - jmatejek@suse.com
 
diff --git a/python-base.spec b/python-base.spec
index 7a6ac37..d2c5bc1 100644
--- a/python-base.spec
+++ b/python-base.spec
@@ -51,6 +51,8 @@ Patch17:        remove-static-libpython.diff
 # PATCH-FIX-OPENSUSE python-2.7.3-ssl_ca_path.patch [bnc#761501] -- Support directory-based certificate stores with the ca_certs parameter of SSL functions
 Patch18:        python-2.7.3-ssl_ca_path.patch
 Patch19:        python-2.7.3-fix-dbm-64bit-bigendian.patch
+# PATCH-FEATURE-OPENSUSE python-bundle-lang.patch bnc#617751 dimstar@opensuse.org -- gettext: when looking in default_localedir also check in locale-bundle.
+Patch20:        python-bundle-lang.patch
 # COMMON-PATCH-END
 %define         python_version    %(echo %{tarversion} | head -c 3)
 BuildRequires:  automake
@@ -138,6 +140,7 @@ other applications.
 %patch17
 %patch18
 %patch19 -p1
+%patch20 -p1
 # COMMON-PREP-END
 
 # drop Autoconf version requirement
diff --git a/python-bundle-lang.patch b/python-bundle-lang.patch
new file mode 100644
index 0000000..f92f8fa
--- /dev/null
+++ b/python-bundle-lang.patch
@@ -0,0 +1,23 @@
+Index: Python-2.7.3/Lib/gettext.py
+===================================================================
+--- Python-2.7.3.orig/Lib/gettext.py
++++ Python-2.7.3/Lib/gettext.py
+@@ -56,6 +56,7 @@ __all__ = ['NullTranslations', 'GNUTrans
+            ]
+ 
+ _default_localedir = os.path.join(sys.prefix, 'share', 'locale')
++_default_bundlelocaledir = os.path.join(sys.prefix, 'share', 'locale-bundle')
+ 
+ 
+ def test(condition, true, false):
+@@ -420,6 +421,10 @@ class GNUTranslations(NullTranslations):
+ 
+ # Locate a .mo file using the gettext strategy
+ def find(domain, localedir=None, languages=None, all=0):
++    if localedir in [None, _default_localedir]:
++        bundle = find(domain, localedir=_default_bundlelocaledir, languages=languages, all=all)
++        if len(bundle):
++            return bundle
+     # Get some reasonable defaults for arguments that were not supplied
+     if localedir is None:
+         localedir = _default_localedir
diff --git a/python-doc.spec b/python-doc.spec
index ef69e11..249682c 100644
--- a/python-doc.spec
+++ b/python-doc.spec
@@ -47,6 +47,8 @@ Patch17:        remove-static-libpython.diff
 # PATCH-FIX-OPENSUSE python-2.7.3-ssl_ca_path.patch [bnc#761501] -- Support directory-based certificate stores with the ca_certs parameter of SSL functions
 Patch18:        python-2.7.3-ssl_ca_path.patch
 Patch19:        python-2.7.3-fix-dbm-64bit-bigendian.patch
+# PATCH-FEATURE-OPENSUSE python-bundle-lang.patch bnc#617751 dimstar@opensuse.org -- gettext: when looking in default_localedir also check in locale-bundle.
+Patch20:        python-bundle-lang.patch
 # COMMON-PATCH-END
 Provides:       pyth_doc
 Provides:       pyth_ps
@@ -95,6 +97,7 @@ Python, and Macintosh Module Reference in PDF format.
 %patch17
 %patch18
 %patch19 -p1
+%patch20 -p1
 # COMMON-PREP-END
 
 %build
diff --git a/python.spec b/python.spec
index c2d8741..1b0f5b4 100644
--- a/python.spec
+++ b/python.spec
@@ -55,6 +55,8 @@ Patch17:        remove-static-libpython.diff
 # PATCH-FIX-OPENSUSE python-2.7.3-ssl_ca_path.patch [bnc#761501] -- Support directory-based certificate stores with the ca_certs parameter of SSL functions
 Patch18:        python-2.7.3-ssl_ca_path.patch
 Patch19:        python-2.7.3-fix-dbm-64bit-bigendian.patch
+# PATCH-FEATURE-OPENSUSE python-bundle-lang.patch bnc#617751 dimstar@opensuse.org -- gettext: when looking in default_localedir also check in locale-bundle.
+Patch20:        python-bundle-lang.patch
 # COMMON-PATCH-END
 BuildRequires:  automake
 BuildRequires:  db-devel
@@ -178,6 +180,7 @@ implementation of the standard Unix DBM databases.
 %patch17
 %patch18
 %patch19 -p1
+%patch20 -p1
 # COMMON-PREP-END
 
 # drop Autoconf version requirement