diff --git a/.gitignore b/.gitignore
index ad8c03b..f8edbe0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /freeipa-healthcheck-0.6.tar.gz
 /freeipa-healthcheck-0.7.tar.gz
 /0.8.tar.gz
+/0.9.tar.gz
diff --git a/0001-Remove-ipaclustercheck.patch b/0001-Remove-ipaclustercheck.patch
index b431457..fb6b2ee 100644
--- a/0001-Remove-ipaclustercheck.patch
+++ b/0001-Remove-ipaclustercheck.patch
@@ -1,6 +1,6 @@
-From 22b88b28af56a39c395227daf294b113bf755ce3 Mon Sep 17 00:00:00 2001
+From 3c82636f3b1333333314bbc012d30a7faed00261 Mon Sep 17 00:00:00 2001
 From: Rob Crittenden <rcritten@redhat.com>
-Date: Wed, 13 Jan 2021 14:09:58 -0500
+Date: Tue, 8 Jun 2021 13:51:28 -0400
 Subject: [PATCH] Remove ipaclustercheck
 
 Not shipping it from upstream into Fedora just yet
@@ -27,13 +27,13 @@ Not shipping it from upstream into Fedora just yet
  delete mode 100644 tests/test_cluster_ruv.py
 
 diff --git a/setup.py b/setup.py
-index ee2497e..5470772 100644
+index f2bdb7b..2abcf7f 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -4,7 +4,7 @@ from setuptools import find_packages, setup
  setup(
      name='ipahealthcheck',
-     version='0.8',
+     version='0.9',
 -    namespace_packages=['ipahealthcheck', 'ipaclustercheck'],
 +    namespace_packages=['ipahealthcheck'],
      package_dir={'': 'src'},
@@ -636,5 +636,5 @@ index 7583c84..0000000
 -        assert result.kw.get('name') == 'dangling_csruv'
 -        assert result.kw.get('value') == '9'
 -- 
-2.26.2
+2.26.3
 
diff --git a/freeipa-healthcheck.spec b/freeipa-healthcheck.spec
index cf58a92..7f1368a 100644
--- a/freeipa-healthcheck.spec
+++ b/freeipa-healthcheck.spec
@@ -16,8 +16,8 @@
 %bcond_without tests
 
 Name:           %{prefix}-healthcheck
-Version:        0.8
-Release:        8.1%{?dist}
+Version:        0.9
+Release:        1%{?dist}
 Summary:        Health check tool for %{productname}
 BuildArch:      noarch
 License:        GPLv3
@@ -26,8 +26,6 @@ Source0:        https://github.com/freeipa/freeipa-healthcheck/archive/%{version
 Source1:        ipahealthcheck.conf
 
 Patch0001:      0001-Remove-ipaclustercheck.patch
-Patch0002:      0002-Handle-slight-different-in-exception-output-in-Pytho.patch
-Patch0003:      0003-Failed-expected-group-should-be-a-string-not-a-list.patch
 
 Requires:       %{name}-core = %{version}-%{release}
 Requires:       %{prefix}-server
@@ -116,7 +114,7 @@ install -p -m644 %{_builddir}/freeipa-healthcheck-%{version}/man/man5/ipahealthc
 
 %if %{with tests}
 %check
-PYTHONPATH=src pytest-3 tests/test_*
+PYTHONPATH=src PATH=$PATH:$RPM_BUILD_ROOT/usr/bin pytest-3 tests/test_*
 %endif
 
 
@@ -157,13 +155,17 @@ PYTHONPATH=src pytest-3 tests/test_*
 
 
 %changelog
+* Tue Jun  8 2021 Rob Crittenden <rcritten@redhat.com> - 0.9-1
+- Update to upstream 0.9
+- Fix bad date in 0.8-6.1 changelog entry
+
 * Mon Jun 07 2021 Python Maint <python-maint@redhat.com> - 0.8-8.1
 - Rebuilt for Python 3.10
 
 * Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 0.8-7.1
 - Bootstrap for Python 3.10
 
-* Tue Apr 15 2021 Rob Crittenden <rcritten@redhat.com> - 0.8-6.1
+* Thu Apr 15 2021 Rob Crittenden <rcritten@redhat.com> - 0.8-6.1
 - Switch from tox to pytest as the test runner. tox is being deprecated
   in some distros.
 
diff --git a/sources b/sources
index 01c235d..49bc082 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (0.8.tar.gz) = c73286fa0881d94b7b461897d113b3cd937bedd05a1a9b59f0638be3de0fa2c91fffca0b6d5af58bf22fa8f3b6ed503bfd057f7741913185e84d1f790113160b
+SHA512 (0.9.tar.gz) = 019c945428d2ce1d726fab496d16c019a5d17bf14ea07382195c8ce5a6c1f08250bee22e5be90f501ee3ec22cdd2b18f7c0852f74133bb9a28bec8d2c774ca54