diff --git a/.gitignore b/.gitignore
index 36496cc..99f69bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@ bodhi-0.7.14.tar.bz2
 /2.3.3.tar.gz
 /2.4.0.tar.gz
 /bodhi-2.5.0.tar.gz
+/bodhi-2.6.0.tar.gz
diff --git a/0000-Hard-code-wait_for_sync-to-look-for-x86_64.patch b/0000-Hard-code-wait_for_sync-to-look-for-x86_64.patch
deleted file mode 100644
index cf1bc80..0000000
--- a/0000-Hard-code-wait_for_sync-to-look-for-x86_64.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 72b062de6687502a9cd9498e70d2cd6c084527d0 Mon Sep 17 00:00:00 2001
-From: Randy Barlow <randy@electronsweatshop.com>
-Date: Fri, 10 Mar 2017 15:11:10 -0500
-Subject: [PATCH] Hard code wait_for_sync() to look for x86_64.
-
----
- bodhi/server/consumers/masher.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bodhi/server/consumers/masher.py b/bodhi/server/consumers/masher.py
-index 38e1eec3..978963fb 100644
---- a/bodhi/server/consumers/masher.py
-+++ b/bodhi/server/consumers/masher.py
-@@ -750,7 +750,7 @@ class MasherThread(threading.Thread):
-             force=True,
-         )
-         mash_path = os.path.join(self.path, self.id)
--        arch = os.listdir(mash_path)[0]
-+        arch = 'x86_64'
- 
-         release = self.release.id_prefix.lower().replace('-', '_')
-         request = self.request.value
--- 
-2.12.0
-
diff --git a/0001-Load-the-config-before-getting-the-db-factory.patch b/0001-Load-the-config-before-getting-the-db-factory.patch
deleted file mode 100644
index b40233b..0000000
--- a/0001-Load-the-config-before-getting-the-db-factory.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 98b4b0dee3bd9d02c670f8c23334d9d541f9793c Mon Sep 17 00:00:00 2001
-From: Randy Barlow <randy@electronsweatshop.com>
-Date: Mon, 10 Apr 2017 13:41:25 -0400
-Subject: [PATCH] Load the config before getting the db factory.
-
-This hotfix was written for
-https://github.com/fedora-infra/bodhi/issues/1423 by Patrick
-Uiterwijk.
-
-Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
----
- bodhi/server/models.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/bodhi/server/models.py b/bodhi/server/models.py
-index bacba3b..0aac544 100644
---- a/bodhi/server/models.py
-+++ b/bodhi/server/models.py
-@@ -2435,6 +2435,7 @@ def get_db_factory():
-     session that you can use with a context manager. If you wish to get a database session for a
-     request, see bodhi.server.get_db_session_for_request().
-     """
-+    config.load_config()
-     engine = engine_from_config(config, 'sqlalchemy.')
-     Base.metadata.create_all(engine)
-     return transactional_session_maker(engine)
--- 
-1.8.3.1
-
diff --git a/bodhi.spec b/bodhi.spec
index 6540dcd..676b75f 100644
--- a/bodhi.spec
+++ b/bodhi.spec
@@ -1,6 +1,6 @@
 Name:           bodhi
-Version:        2.5.0
-Release:        2%{?dist}
+Version:        2.6.0
+Release:        1%{?dist}
 BuildArch:      noarch
 
 License:        GPLv2+
@@ -8,9 +8,6 @@ Summary:        A modular framework that facilitates publishing software updates
 Group:          Applications/Internet
 URL:            https://github.com/fedora-infra/bodhi
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-Patch0:         0000-Hard-code-wait_for_sync-to-look-for-x86_64.patch
-# https://github.com/fedora-infra/bodhi/issues/1423
-Patch1:         0001-Load-the-config-before-getting-the-db-factory.patch
 
 # For the tests
 BuildRequires:   python2
@@ -35,7 +32,6 @@ BuildRequires:   python-pyramid-fas-openid
 BuildRequires:   packagedb-cli
 
 BuildRequires:   python-sqlalchemy
-BuildRequires:   python-zope-sqlalchemy
 BuildRequires:   python2-sqlalchemy_schemadisplay
 
 BuildRequires:   python-webhelpers
@@ -151,7 +147,6 @@ Requires:   python-pyramid-fas-openid
 Requires:   packagedb-cli
 
 Requires:   python-sqlalchemy
-Requires:   python-zope-sqlalchemy
 
 Requires:   python-webhelpers
 Requires:   python-progressbar
@@ -216,9 +211,6 @@ updates for a software distribution.
 %prep
 %setup -q -n bodhi-%{version}
 
-%patch0 -p1
-%patch1 -p1
-
 # Kill some dev deps
 sed -i '/pyramid_debugtoolbar/d' setup.py
 sed -i '/pyramid_debugtoolbar/d' development.ini.example
@@ -278,15 +270,6 @@ if [ ! -e %{buildroot}%{python2_sitelib}/%{name}/server/static/bootstrap ]; then
     /usr/bin/false
 fi;
 
-# Patch2 breaks the unit tests, but in a way that is expected an OK. We will skip the tests for
-# bodhi-2.5.0.
-if [ "%{version}" == "2.5.0" ]; then
-    exit 0;
-fi
-
-echo "REMOVE THIS AND THE ABOVE IF STATEMENT WHEN THE VERSION IS NOT 2.5.0 ANYMORE!"
-exit 1;
-
 PYTHONPATH=. %{__python2} setup.py nosetests
 
 
@@ -341,6 +324,10 @@ PYTHONPATH=. %{__python2} setup.py nosetests
 
 
 %changelog
+* Mon Apr 17 2017 Randy Barlow <bowlofeggs@fedoraproject.org> - 2.6.0-1
+- Update to 2.6.0.
+- https://github.com/fedora-infra/bodhi/releases/tag/2.6.0
+
 * Mon Apr 10 2017 Randy Barlow <bowlofeggs@fedoraproject.org> - 2.5.0-2
 - Apply a patch to fix https://github.com/fedora-infra/bodhi/issues/1423
 - Temporarily disable the tests since the patch causes two of them to fail, expectedly.
diff --git a/sources b/sources
index 86ac6e7..1816352 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bodhi-2.5.0.tar.gz) = e09891565dcf9455c335e4323aaebdd0408645d8ff4e9aaf19172a33cbbfc4969ec3c59c986748e6484e17129ea9dd02674c0c8e2f4a648a451bcde9fbf28cd8
+SHA512 (bodhi-2.6.0.tar.gz) = 707c20e7c1a6806b16f7220b39d792de32d92d6abceb5d097334955d114b3b679392f798d62ea5896dcf039b8e56711e29cd5eabccc51e164b00489722a742eb