diff --git a/.custodia.metadata b/.custodia.metadata
new file mode 100644
index 0000000..7ac4e2a
--- /dev/null
+++ b/.custodia.metadata
@@ -0,0 +1 @@
+a784e2402a4e1885f2c2a34bd6b064bdf302fa41 SOURCES/custodia-0.6.0.tar.gz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..bb26bdd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+SOURCES/custodia-0.6.0.tar.gz
diff --git a/SOURCES/custodia.conf b/SOURCES/custodia.conf
new file mode 100644
index 0000000..5e4b584
--- /dev/null
+++ b/SOURCES/custodia.conf
@@ -0,0 +1,32 @@
+# /etc/custodia/custodia.conf
+[global]
+debug = true
+makedirs = true
+
+[store:sqlite]
+handler = SqliteStore
+dburi = ${libdir}/secrets.db
+table = secrets
+
+[store:encrypted_sqlite]
+handler = EncryptedOverlay
+backing_store = sqlite
+master_key = ${libdir}/secrets.key
+master_enctype = A128CBC-HS256
+autogen_master_key = true
+
+[auth:creds]
+handler = SimpleCredsAuth
+uid = root
+gid = root
+
+[authz:paths]
+handler = SimplePathAuthz
+paths = /. /secrets
+
+[/]
+handler = Root
+
+[/secrets]
+handler = Secrets
+store = encrypted_sqlite
diff --git a/SOURCES/custodia.tmpfiles.conf b/SOURCES/custodia.tmpfiles.conf
new file mode 100644
index 0000000..cacc039
--- /dev/null
+++ b/SOURCES/custodia.tmpfiles.conf
@@ -0,0 +1 @@
+d /run/custodia 0755 custodia custodia
diff --git a/SOURCES/custodia@.service b/SOURCES/custodia@.service
new file mode 100644
index 0000000..ef539f9
--- /dev/null
+++ b/SOURCES/custodia@.service
@@ -0,0 +1,21 @@
+# /etc/systemd/system/custodia@.service
+
+[Unit]
+Description=Custodia Secrets Service for %I
+Documentation=https://github.com/latchset/custodia
+Requires=custodia@%i.socket
+After=network.target
+
+[Service]
+Type=notify
+ExecStart=/usr/sbin/custodia --instance=%i /etc/custodia/%i.conf
+User=custodia
+Group=custodia
+ProtectSystem=full
+ProtectHome=true
+NoNewPrivileges=true
+Restart=on-failure
+RestartSec=30s
+
+[Install]
+WantedBy=multi-user.target
diff --git a/SOURCES/custodia@.socket b/SOURCES/custodia@.socket
new file mode 100644
index 0000000..fbd0fab
--- /dev/null
+++ b/SOURCES/custodia@.socket
@@ -0,0 +1,18 @@
+# /etc/systemd/system/custodia@.socket
+
+[Unit]
+Description=Custodia Socket for %i
+Documentation=https://github.com/latchset/custodia
+
+[Socket]
+ListenStream=/var/run/custodia/%i.sock
+Service=custodia@%i.service
+RemoveOnStop=true
+SocketUser=custodia
+SocketGroup=custodia
+SocketMode=0666
+PassCredentials=true
+PassSecurity=true
+
+[Install]
+WantedBy=sockets.target
diff --git a/SOURCES/nonfatal_deprecation.patch b/SOURCES/nonfatal_deprecation.patch
new file mode 100644
index 0000000..12fbb7f
--- /dev/null
+++ b/SOURCES/nonfatal_deprecation.patch
@@ -0,0 +1,11 @@
+--- a/tests/conftest.py.orig 2018-06-29 18:06:51.296810334 +0200
++++ b/tests/conftest.py 2018-06-29 18:06:58.691767950 +0200
+@@ -9,7 +9,7 @@
+ from custodia.log import ProvisionalWarning, setup_logging
+
+ # deprecated APIs raise an exception
+-warnings.simplefilter('error', category=DeprecationWarning)
++# warnings.simplefilter('error', category=DeprecationWarning)
+ # ignore pytest warnings
+ warnings.filterwarnings('ignore', category=DeprecationWarning,
+ module=r'_pytest\..*')
diff --git a/SPECS/custodia.spec b/SPECS/custodia.spec
new file mode 100644
index 0000000..2ff9ba6
--- /dev/null
+++ b/SPECS/custodia.spec
@@ -0,0 +1,251 @@
+Name: custodia
+Version: 0.6.0
+Release: 2%{?dist}
+Summary: A service to manage, retrieve and store secrets for other processes
+
+License: GPLv3+
+URL: https://github.com/latchset/%{name}
+Source0: https://github.com/latchset/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
+Source2: custodia.conf
+Source3: custodia@.service
+Source4: custodia@.socket
+Source5: custodia.tmpfiles.conf
+
+Patch1: nonfatal_deprecation.patch
+
+BuildArch: noarch
+
+BuildRequires: systemd
+
+BuildRequires: python%{python3_pkgversion}-devel
+BuildRequires: python%{python3_pkgversion}-jwcrypto >= 0.4.2
+BuildRequires: python%{python3_pkgversion}-requests
+BuildRequires: python%{python3_pkgversion}-setuptools > 18
+BuildRequires: python%{python3_pkgversion}-coverage
+BuildRequires: python%{python3_pkgversion}-pytest
+BuildRequires: python%{python3_pkgversion}-docutils
+BuildRequires: python%{python3_pkgversion}-systemd
+
+Requires: python%{python3_pkgversion}-custodia = %{version}-%{release}
+
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+Requires(post): systemd-units
+
+
+%global overview \
+Custodia is a Secrets Service Provider, it stores or proxies access to \
+keys, password, and secret material in general. Custodia is built to \
+use the HTTP protocol and a RESTful API as an IPC mechanism over a local \
+Unix Socket. It can also be exposed to a network via a Reverse Proxy \
+service assuming proper authentication and header validation is \
+implemented in the Proxy. \
+ \
+Custodia is modular, the configuration file controls how authentication, \
+authorization, storage and API plugins are combined and exposed.
+
+
+%description
+A service to manage, retrieve and store secrets for other processes
+
+%{overview}
+
+%package -n python%{python3_pkgversion}-custodia
+Summary: Sub-package with python3 custodia modules
+%{?python_provide:%python_provide python3-%{name}}
+Requires: python%{python3_pkgversion}-jwcrypto >= 0.4.2
+Requires: python%{python3_pkgversion}-requests
+Requires: python%{python3_pkgversion}-setuptools
+Requires: python%{python3_pkgversion}-systemd
+Conflicts: python%{python3_pkgversion}-custodia-extra < %{version}
+Obsoletes: python%{python3_pkgversion}-custodia-extra < %{version}
+
+%description -n python%{python3_pkgversion}-custodia
+Sub-package with python custodia modules
+
+%{overview}
+
+
+%prep
+%autosetup -p1
+
+
+%build
+%py3_build
+
+
+%check
+# don't download packages
+export PIP_INDEX_URL=http://host.invalid./
+# Don't try to download dnspython3. The package is provided by python%{python3_pkgversion}-dns
+export PIP_NO_DEPS=yes
+# Ignore all install packages to enforce installation of sdist. Otherwise tox
+# may pick up this package from global site-packages instead of source dist.
+export PIP_IGNORE_INSTALLED=yes
+
+# Test custodia in a virtual environment
+%{__python3} -m venv --system-site-packages testenv
+testenv/bin/pip install .
+testenv/bin/python -m pytest --capture=no --strict --skip-servertests
+
+
+%install
+mkdir -p %{buildroot}/%{_sbindir}
+mkdir -p %{buildroot}/%{_mandir}/man7
+mkdir -p %{buildroot}/%{_defaultdocdir}/custodia
+mkdir -p %{buildroot}/%{_defaultdocdir}/custodia/examples
+mkdir -p %{buildroot}/%{_sysconfdir}/custodia
+mkdir -p %{buildroot}/%{_unitdir}
+mkdir -p %{buildroot}/%{_tmpfilesdir}
+mkdir -p %{buildroot}/%{_localstatedir}/lib/custodia
+mkdir -p %{buildroot}/%{_localstatedir}/log/custodia
+mkdir -p %{buildroot}/%{_localstatedir}/run/custodia
+
+install -m 644 -t "%{buildroot}/%{_mandir}/man7" man/custodia.7
+install -m 644 -t "%{buildroot}/%{_defaultdocdir}/custodia" README API.md
+install -m 644 -t "%{buildroot}/%{_defaultdocdir}/custodia/examples" custodia.conf
+install -m 600 %{SOURCE2} %{buildroot}%{_sysconfdir}/custodia
+install -m 644 %{SOURCE3} %{buildroot}%{_unitdir}
+install -m 644 %{SOURCE4} %{buildroot}%{_unitdir}
+install -m 644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}/custodia.conf
+
+%py3_install
+mv %{buildroot}/%{_bindir}/custodia %{buildroot}/%{_sbindir}/custodia
+cp %{buildroot}/%{_sbindir}/custodia %{buildroot}/%{_sbindir}/custodia-3
+cp %{buildroot}/%{_bindir}/custodia-cli %{buildroot}/%{_bindir}/custodia-cli-3
+
+
+%pre
+getent group custodia >/dev/null || groupadd -r custodia
+getent passwd custodia >/dev/null || \
+ useradd -r -g custodia -d / -s /sbin/nologin \
+ -c "User for custodia" custodia
+exit 0
+
+
+%post
+%systemd_post custodia@\*.socket
+%systemd_post custodia@\*.service
+
+
+%preun
+%systemd_preun custodia@\*.socket
+%systemd_preun custodia@\*.service
+
+
+%postun
+%systemd_postun custodia@\*.socket
+%systemd_postun custodia@\*.service
+
+
+%files
+%doc README API.md
+%doc %{_defaultdocdir}/custodia/examples/custodia.conf
+%license LICENSE
+%{_mandir}/man7/custodia*
+%{_sbindir}/custodia
+%{_bindir}/custodia-cli
+%dir %attr(0700,custodia,custodia) %{_sysconfdir}/custodia
+%config(noreplace) %attr(600,custodia,custodia) %{_sysconfdir}/custodia/custodia.conf
+%attr(644,root,root) %{_unitdir}/custodia@.socket
+%attr(644,root,root) %{_unitdir}/custodia@.service
+%dir %attr(0700,custodia,custodia) %{_localstatedir}/lib/custodia
+%dir %attr(0700,custodia,custodia) %{_localstatedir}/log/custodia
+%dir %attr(0755,custodia,custodia) %{_localstatedir}/run/custodia
+%{_tmpfilesdir}/custodia.conf
+
+%files -n python%{python3_pkgversion}-custodia
+%license LICENSE
+%{python3_sitelib}/%{name}
+%{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info
+%{python3_sitelib}/%{name}-%{version}-py%{python3_version}-nspkg.pth
+%{_sbindir}/custodia-3
+%{_bindir}/custodia-cli-3
+
+
+%changelog
+* Fri Jun 29 2018 Christian Heimes <cheimes@redhat.com> - 0.6.0-2
+- Don't turn deprecation warnings into fatal errors
+
+* Mon Jun 25 2018 Christian Heimes <cheimes@redhat.com> - 0.6.0-1
+- New upstream release Custodia 0.6.0
+- Run all tests again
+- Remove etcd support and python3-custodia-extra
+- Remove unnecesary conflict with old FreeIPA
+
+* Wed Jun 20 2018 Petr Viktorin <pviktori@redhat.com> - 0.5.0-12
+- Remove the Python 2 subpackage
+- Skip a test that fails on a different logging/error message
+- In %%check, use pytest directly rather than tox
+
+* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.5.0-11
+- Escape macros in %%changelog
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Mon Aug 07 2017 Christian Heimes <cheimes@redhat.com> - 0.5.0-9
+- freeipa 4.4.4-2.fc26 and newer are compatible with custodia 0.5
+- Fix dependency to python2-jwcrypto >= 0.4.2
+
+* Wed Aug 02 2017 Christian Heimes <cheimes@redhat.com> - 0.5.0-8
+- Add PIP_IGNORE_INSTALLED
+
+* Tue Aug 01 2017 Christian Heimes <cheimes@redhat.com> - 0.5.0-7
+- Modernize spec
+
+* Tue Aug 01 2017 Christian Heimes <cheimes@redhat.com> - 0.5.0-6
+- Require latest python-jwcrypto with Python 3 fix
+- Use python2 prefix for all Python 2 dependencies
+
+* Tue Aug 01 2017 Christian Heimes <cheimes@redhat.com> - 0.5.0-5
+- Add custodia user and named systemd instances
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue Jun 20 2017 Christian Heimes <cheimes@redhat.com> - 0.5.0-3
+- Add systemd build requirement for tmpfilesdir and unitdir macros
+
+* Mon Jun 19 2017 Christian Heimes <cheimes@redhat.com> - 0.5.0-2
+- Skip etcd store on PPC64
+- Add missing pre/post install hooks for systemd service
+- Custodia 0.5 is compatible with FreeIPA 4.4.5 and newer
+- Drop custodia user from tmpfiles.d conf
+
+* Tue May 16 2017 Simo Sorce <simo@redhat.com> - 0.5.0-1
+- New Custodia version
+- Drop checks on sha512sum, these checks are already done by dist-git
+
+* Tue Apr 11 2017 Christian Heimes <cheimes@redhat.com> - 0.3.1-3
+- Run Python 3 tests with correct Python version
+
+* Fri Apr 07 2017 Christian Heimes <cheimes@redhat.com> - 0.3.1-2
+- Add conflict with FreeIPA < 4.5
+
+* Mon Mar 27 2017 Christian Heimes <cheimes@redhat.com> - 0.3.1-1
+- Upstream release 0.3.1
+
+* Thu Mar 16 2017 Christian Heimes <cheimes@redhat.com> - 0.3.0-3
+- Provide custodia-2 and custodia-3 scripts
+
+* Thu Mar 02 2017 Christian Heimes <cheimes@redhat.com> - 0.3.0-2
+- Run Custodia daemon with Python 3
+- Resolves: Bug 1426737 - custodia: Provide a Python 3 subpackage
+
+* Wed Mar 01 2017 Christian Heimes <cheimes@redhat.com> - 0.3.0-1
+- Update to custodia 0.3.0
+- Run tests with global site packages
+- Add tmpfiles.d config for /run/custodia
+
+* Wed Feb 22 2017 Christian Heimes <cheimes@redhat.com> - 0.2.0-4
+- Add missing runtime requirement on python[23]-systemd.
+- Drop unnecesary build dependency on python%%{python3_pkgversion}-configparser.
+- Fix tests, don't try to download dnspython3.
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Dec 22 2016 Miro Hrončok <mhroncok@redhat.com> - 0.2.0-2
+- Rebuild for Python 3.6
+