diff --git a/.gitignore b/.gitignore
index 4013a68..79f1238 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,3 +58,4 @@ bodhi-0.7.14.tar.bz2
 /bodhi-3.5.0.tar.gz
 /bodhi-3.5.1.tar.gz
 /bodhi-3.5.2.tar.gz
+/bodhi-3.6.0.tar.gz
diff --git a/bodhi.spec b/bodhi.spec
index 5e9e231..d302627 100644
--- a/bodhi.spec
+++ b/bodhi.spec
@@ -1,5 +1,5 @@
 Name:           bodhi
-Version:        3.5.2
+Version:        3.6.0
 Release:        1%{?dist}
 BuildArch:      noarch
 
@@ -46,7 +46,7 @@ BuildRequires: fedmsg
 BuildRequires: koji
 BuildRequires: liberation-mono-fonts
 BuildRequires: packagedb-cli
-BuildRequires: pungi
+BuildRequires: pungi >= 4.1.20
 BuildRequires: python2-createrepo_c
 BuildRequires: python2-devel
 BuildRequires: python2-dnf
@@ -143,13 +143,14 @@ Requires: intltool
 Requires: liberation-mono-fonts
 Requires: mod_wsgi
 Requires: packagedb-cli
-Requires: pungi
+Requires: pungi  >= 4.1.20
 Requires: python2-bodhi == %{version}-%{release}
 Requires: python2-createrepo_c
 Requires: python2-dogpile-cache
 Requires: python2-koji
 Requires: python2-librepo
 Requires: python2-pillow
+Requires: skopeo
 
 Provides:  bundled(aajohan-comfortaa-fonts)
 Provides:  bundled(abattis-cantarell-fonts)
@@ -298,6 +299,10 @@ virtualenv --system-site-packages --no-pip --never-download .test-virtualenv
 
 
 %changelog
+* Mon Apr 16 2018 Randy Barlow <bowlofeggs@fedoraproject.org> - 3.6.0-1
+- Update to 3.6.0 (#1567959).
+- https://bodhi.stg.fedoraproject.org/docs/user/release_notes.html#v3-6-0
+
 * Mon Mar 26 2018 Randy Barlow <bowlofeggs@fedoraproject.org> - 3.5.2-1
 - Update to 3.5.2 (#1560680).
 - https://bodhi.fedoraproject.org/docs/user/release_notes.html#v3-5-2
diff --git a/sources b/sources
index 4b845b0..8b1f5df 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bodhi-3.5.2.tar.gz) = 6ccf555e7e6850375e209b1e38cc27783e7ef2f576fb2fbb025c7fcf0948c997434064857baa9bbf24075394f54c6b55c42f7af6a572d772f3bc86a5f02fc4df
+SHA512 (bodhi-3.6.0.tar.gz) = d76fb9169cd30c396d3ec8dd9aa7aca48eec78dee51f3d09dab97d6567244979b0687a9b2b7770d0cd49cc8187ea60d04c9e70cec1f1bd3af6f6198425f83fed