diff --git a/python-boto.spec b/python-boto.spec
index 9f18a4f..4555ac9 100644
--- a/python-boto.spec
+++ b/python-boto.spec
@@ -13,6 +13,10 @@ BuildRequires:	python-devel >= 2.5, python-setuptools-devel
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=838076
+# Fixed with upstream commit 6870daf
+Patch1:         python-boto-2.5.2-emptydata.patch
+
 %description
 Boto is a Python package that provides interfaces to Amazon Web Services.
 It supports S3 (Simple Storage Service), SQS (Simple Queue Service) via
@@ -22,6 +26,7 @@ use, lightweight wrapper around the Amazon services.
 
 %prep
 %setup -q -n %{pkgname}-%{version}
+%patch1 -p1
 
 %build
 %{__python} setup.py build
@@ -58,6 +63,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Fri Jul  6 2012 Garrett Holmstrom <gholms@fedoraproject.org> - 2.5.2-1
 - Updated to 2.5.2
+- Fixed failure when metadata is empty (#838076)
 
 * Thu Jun 14 2012 Garrett Holmstrom <gholms@fedoraproject.org> - 2.5.1-1
 - Updated to 2.5.1 (last-minute upstream bugfix)