diff --git a/.gitignore b/.gitignore
index 3d1f450..0ef9e10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /fedora_messaging-1.2.0.tar.gz
 /fedora_messaging-1.3.0.tar.gz
 /fedora_messaging-1.5.0.tar.gz
+/fedora_messaging-1.6.0.tar.gz
diff --git a/Remove-service-identity-from-dependencies.patch b/Remove-service-identity-from-dependencies.patch
index 2287232..9ef2956 100644
--- a/Remove-service-identity-from-dependencies.patch
+++ b/Remove-service-identity-from-dependencies.patch
@@ -1,9 +1,9 @@
 From eb217b2a373ae0dcbb82f81f23d1f14a627fe4a3 Mon Sep 17 00:00:00 2001
 From: Jeremy Cline <jcline@redhat.com>
 Date: Wed, 10 Oct 2018 15:54:15 -0400
-Subject: [PATCH] Remove service_identity from dependencies
+Subject: [PATCH] Remove service_identity and Twisted from dependencies
 
-EL7 doesn't have Twisted support.
+EL7 doesn't have service_identity and Twisted is called something else.
 
 Signed-off-by: Jeremy Cline <jcline@redhat.com>
 ---
@@ -11,11 +11,16 @@ Signed-off-by: Jeremy Cline <jcline@redhat.com>
  1 file changed, 1 deletion(-)
 
 diff --git a/requirements.txt b/requirements.txt
-index b476adc..cf8ef28 100644
+index 13d3999..f9dc7d1 100644
 --- a/requirements.txt
 +++ b/requirements.txt
-@@ -5,4 +5,3 @@ pytoml
+@@ -2,9 +2,7 @@ blinker
+ click
+ jsonschema
+ toml
+-Twisted
  pytz
+ PyOpenSSL
  pika>=0.12
  six
 -service_identity
diff --git a/fedora-messaging.spec b/fedora-messaging.spec
index 9625162..332c102 100644
--- a/fedora-messaging.spec
+++ b/fedora-messaging.spec
@@ -4,7 +4,7 @@
 Tools and APIs to make working with AMQP in Fedora easier.
 
 Name:           %{pkgname}
-Version:        1.5.0
+Version:        1.6.0
 Release:        2%{?dist}
 Summary:        Set of tools for using Fedora's messaging infrastructure
 
@@ -24,6 +24,7 @@ BuildRequires:  python-pika >= 0.12.0
 BuildRequires:  pyOpenSSL
 BuildRequires:  pytest
 BuildRequires:  python-toml
+BuildRequires:  python-twisted-core
 BuildRequires:  python-pytz
 BuildRequires:  python-six
 BuildRequires:  python-sphinx
@@ -43,7 +44,9 @@ Requires:       python-click
 Requires:       python-jsonschema
 Requires:       python-pika >= 0.12.0
 Requires:       pyOpenSSL
-Requires:       python-pytoml
+Requires:       python-toml
+Requires:       python-twisted-core
+Requires:       python-setuptools
 Requires:       python-six
 Requires:       python-pytz
 
@@ -77,6 +80,11 @@ rm -rf docs/_build/*/.buildinfo
 %install
 %py2_install
 install -D -m 644 config.toml.example $RPM_BUILD_ROOT%{_sysconfdir}/fedora-messaging/config.toml
+install -D -m 644 configs/fedora.toml $RPM_BUILD_ROOT%{_sysconfdir}/fedora-messaging/fedora.toml
+install -D -m 644 configs/cacert.pem $RPM_BUILD_ROOT%{_sysconfdir}/fedora-messaging/cacert.pem
+# Yes, this is supposed to be a world-readable private key. It's for public Fedora broker access.
+install -D -m 644 configs/fedora-key.pem $RPM_BUILD_ROOT%{_sysconfdir}/fedora-messaging/fedora-key.pem
+install -D -m 644 configs/fedora-cert.pem $RPM_BUILD_ROOT%{_sysconfdir}/fedora-messaging/fedora-cert.pem
 install -D -m 644 docs/_build/man/fedora-messaging.1 $RPM_BUILD_ROOT%{_mandir}/man1/fedora-messaging.1
 install -D -m 644 fm-consumer@.service $RPM_BUILD_ROOT%{_unitdir}/fm-consumer@.service
 
@@ -90,6 +98,10 @@ py.test -vv fedora_messaging/tests/unit/
 %license LICENSE
 %doc README.rst
 %config(noreplace) %{_sysconfdir}/fedora-messaging/config.toml
+%config(noreplace) %{_sysconfdir}/fedora-messaging/fedora.toml
+%config(noreplace) %{_sysconfdir}/fedora-messaging/cacert.pem
+%config(noreplace) %{_sysconfdir}/fedora-messaging/fedora-key.pem
+%config(noreplace) %{_sysconfdir}/fedora-messaging/fedora-cert.pem
 %{_mandir}/man1/%{name}.*
 %{_bindir}/%{name}
 %{_unitdir}/fm-consumer@.service
@@ -105,6 +117,12 @@ py.test -vv fedora_messaging/tests/unit/
 
 
 %changelog
+* Fri Apr 05 2019 Jeremy Cline <jcline@redhat.com> - 1.6.0-2
+- Drop Twisted from requires.txt
+
+* Thu Apr 04 2019 Jeremy Cline <jcline@redhat.com> - 1.6.0-1
+- Update to v1.6.0
+
 * Thu Mar 07 2019 Aurelien Bompard <abompard@fedoraproject.org> - 1.5.0-2
 - Add the Systemd service template file.
 
diff --git a/sources b/sources
index 82255cb..a7792e7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fedora_messaging-1.5.0.tar.gz) = df94dcfae936562a1527fbb0d2cab46ab54fc4ee77cacbe09f2cf6a1f5dc441bf75b5a49681ffe2ce0983550674feeaa8bc71b8fc5f51923027bea78122fbeac
+SHA512 (fedora_messaging-1.6.0.tar.gz) = 8a0e77e7ffba11937bf7bf58253bcd3fd3d0aec2744d2d44a6078984a2a2c4f4da470dca8fa0226572534afcb5e9f9624aa0e0481b847f25a52637a9d8eab04f