diff --git a/bodhi-moveshelve.patch b/bodhi-moveshelve.patch
new file mode 100644
index 0000000..6c1e11a
--- /dev/null
+++ b/bodhi-moveshelve.patch
@@ -0,0 +1,12 @@
+diff -rup bodhi-3.1.0.orig/bodhi/server/metadata.py bodhi-3.1.0/bodhi/server/metadata.py
+--- bodhi-3.1.0.orig/bodhi/server/metadata.py	2018-01-05 13:30:26.023231785 +0100
++++ bodhi-3.1.0/bodhi/server/metadata.py	2018-01-05 13:31:04.346162830 +0100
+@@ -87,7 +87,7 @@ class UpdateInfoMetadata(object):
+         self.updates = set()
+         self.builds = {}
+         self._from = config.get('bodhi_email')
+-        self.shelf = shelve.open(os.path.join(mashdir, '%s.shelve' % self.tag))
++        self.shelf = shelve.open('/var/cache/bodhi/%s.shelve' % self.tag)
+         self._fetch_updates()
+ 
+         self.uinfo = cr.UpdateInfo()
diff --git a/bodhi.spec b/bodhi.spec
index 3758ac6..36d3b22 100644
--- a/bodhi.spec
+++ b/bodhi.spec
@@ -1,6 +1,6 @@
 Name:           bodhi
 Version:        3.1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 BuildArch:      noarch
 
 License:        GPLv2+
@@ -9,6 +9,7 @@ Group:          Applications/Internet
 URL:            https://github.com/fedora-infra/bodhi
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 Patch0:         0001-Correct-the-help-text-to-remove-spaces-betwen-builds.patch
+Patch1:		bodhi-moveshelve.patch
 
 BuildRequires:   createrepo_c
 BuildRequires:   fedmsg
@@ -376,6 +377,9 @@ virtualenv --system-site-packages --no-pip --never-download .test-virtualenv
 
 
 %changelog
+* Fri Jan 05 2018 Patrick Uiterwijk <patrick@puiterwijk.org> - 3.1.0-3
+- Apply patch to move the shelves
+
 * Tue Dec 12 2017 Randy Barlow <bowlofeggs@fedoraproject.org> - 3.1.0-2
 - Correct bodhi-client's help text to show the correct syntax for multi-build
   updates (#1515766).