diff --git a/.gitignore b/.gitignore
index 8097471..0baed8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /bloom-516698964a38c27c757b553d6e5de73f9d92af74.tar.gz
 /bloom-71d376cd796a6b7c86551ce9b503abf55cfc0054.tar.gz
 /bloom-cd86c548c9c4ae024478f49f0cd45c0c8bfeb72f.tar.gz
+/bloom-55ed154f301a98f9f6d710589f83fa9587e577f8.tar.gz
diff --git a/bloom-0.6.6-py3.patch b/bloom-0.6.6-py3.patch
new file mode 100644
index 0000000..c4f8c50
--- /dev/null
+++ b/bloom-0.6.6-py3.patch
@@ -0,0 +1,12 @@
+diff -up ./docs/conf.py.py3 ./docs/conf.py
+--- ./docs/conf.py.py3	2018-08-10 18:30:41.375187292 -0400
++++ ./docs/conf.py	2018-08-10 18:30:57.111243181 -0400
+@@ -61,7 +61,7 @@ version = '0.4'
+ # The full version, including alpha/beta/rc tags.
+ setup_py = os.path.join(os.path.dirname(__file__), '..', 'setup.py')
+ import subprocess
+-release = subprocess.check_output('/usr/bin/env python ' + setup_py + ' --version', shell=True).strip()
++release = subprocess.check_output('/usr/bin/env python ' + setup_py + ' --version', shell=True).strip().decode('utf-8')
+ print('Using release version: {0}'.format(release))
+ 
+ # The language for content autogenerated by Sphinx. Refer to documentation
diff --git a/python-bloom.spec b/python-bloom.spec
index 448c5ca..1c50ce4 100644
--- a/python-bloom.spec
+++ b/python-bloom.spec
@@ -1,16 +1,16 @@
-%global commit cd86c548c9c4ae024478f49f0cd45c0c8bfeb72f
+%global commit 55ed154f301a98f9f6d710589f83fa9587e577f8
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           python-bloom
-Version:        0.5.26
-Release:        6%{?dist}
+Version:        0.6.6
+Release:        1%{?dist}
 Summary:        Bloom is a release automation tool
 
 Group:          Development/Tools
 License:        BSD
 URL:            http://www.ros.org/wiki/bloom
 Source0:        https://github.com/ros-infrastructure/bloom/archive/%{commit}/bloom-%{commit}.tar.gz
-
+Patch0:         bloom-0.6.6-py3.patch
 BuildArch:      noarch
 
 BuildRequires:  python2-nose
@@ -68,6 +68,7 @@ generation of platform specific source packages, like debian's src-debs.
 
 %prep
 %setup -qn bloom-%{commit}
+%patch0 -p0 -b .py3
 
 %build
 %py2_build
@@ -120,6 +121,10 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} nosetests-%{python3_version} test/test
 %{_datadir}/man/man1/bloom.1.gz
 
 %changelog
+* Fri Aug 10 2018 Rich Mattes <richmattes@gmail.com> - 0.6.6-1
+- Update to release 0.6.6 (rhbz#1504444)
+- Fix rahwhide FTBFS (rhbz#1605618)
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.26-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index c71e891..d8560e0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bloom-cd86c548c9c4ae024478f49f0cd45c0c8bfeb72f.tar.gz) = 36657ba620f436e73a231823a42af2aa5979e595ee60c6e9f674eff8912058001180128857416de51b55cfc47e3e72f9408a6e59250b5ade6d0f85dee132060e
+SHA512 (bloom-55ed154f301a98f9f6d710589f83fa9587e577f8.tar.gz) = 039df7425f324c57b7ba4d3fdc499f1dc1eaf69cfc4a1446f862b8b0118597b6e925e6eca91d2b4f801cd31e04a6a6ea023fee01fca34761d879b803a99c12da