diff --git a/.gitignore b/.gitignore
index 6d5e7e8..f290e1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,5 @@
 /f304570aaffb9dde1e2eed1eabe739a990e286bc.tar.gz
 /77ef28f6b8c521daf2bb12e89024cbf122af1d63.tar.gz
 /2760e30296884e9160ff0b8e58c2e5d47791f01d.tar.gz
+/3c0cbc69eafffc6f9e192ebdaf48c05517ef130f.tar.gz
+/dfdddb8e394631fb3e4d185d71e5f9b91df9e309.tar.gz
diff --git a/atomic.spec b/atomic.spec
index 6650e4f..a37ffff 100644
--- a/atomic.spec
+++ b/atomic.spec
@@ -11,12 +11,18 @@
 %global __python %{__python3}
 %endif
 
-%global commit 2760e30296884e9160ff0b8e58c2e5d47791f01d
+%global commit 3c0cbc69eafffc6f9e192ebdaf48c05517ef130f
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
+# Registries package
+%global git_atomic_registries https://github.com/projectatomic/registries
+%global commit_atomic_registries dfdddb8e394631fb3e4d185d71e5f9b91df9e309
+%global atomic_registries_shortcommit %(c=%{commit_atomic_registries}; echo ${c:0:7})
+
+
 Name: atomic
-Version: 1.17.2
-Release: 2%{?dist}
+Version: 1.18.1
+Release: 1%{?dist}
 Summary: Tool for managing ProjectAtomic systems and containers
 License: LGPLv2+
 URL: https://github.com/projectatomic/atomic
@@ -26,6 +32,8 @@ ExclusiveArch: i386 i486 i586 i686 pentium3 pentium4 athlon geode x86_64 armv3l 
 ExclusiveArch: x86_64 ppc64le
 %endif
 Source0: https://github.com/projectatomic/%{name}/archive/%{commit}.tar.gz
+Source1: https://github.com/projectatomic/registries/archive/%{commit_atomic_registries}.tar.gz
+
 BuildRequires: %{pypkg}-devel
 BuildRequires: %{pypkg}-requests >= 2.4.3
 BuildRequires: %{pypkg}-setuptools
@@ -63,6 +71,7 @@ Requires: setup
 Requires: skopeo >= 0.1.14-4
 Requires: skopeo-containers >= 0.1.14-4
 Requires: runc
+Requires: ostree
 Requires: rpm-%{pypkg}
 # https://github.com/projectatomic/atomic/pull/180
 Requires: %{pypkg}-dateutil
@@ -81,9 +90,6 @@ Requires: pygobject3-base
 %else
 Requires: %{pypkg}-gobject-base
 %endif
-%if 0%{?fedora}
-Requires: ostree
-%endif
 %if %{with python3}
 Requires: %{pypkg}-PyYAML
 %else
@@ -99,16 +105,44 @@ kinds of containers, such as super-privileged and system containers.
 
 The atomic host subcommand wraps rpm-ostree providing unified management.
 
+# Atomic Registries
+%package registries
+Summary: Parses a global YAML registry file
+Requires: glib2
+Requires: libyaml
+Requires: json-glib
+BuildRequires: libyaml-devel
+BuildRequires: json-glib-devel
+BuildRequires: glib2-devel
+BuildRequires: autoconf
+BuildRequires: automake
+
+%description registries
+Utility that parses a global YAML registry file for container runtimes.
+
 %prep
-%setup -qn %{name}-%{commit}
+tar zxf %{SOURCE0}
+tar zxf %{SOURCE1}
+pushd atomic-%{commit}
 if [ %{pypkg} == 'python3' ]; then
 sed -i 's/input = raw_input/pass/' Atomic/util.py
 fi
+popd
+
+pushd registries-%{commit_atomic_registries}
+sh ./autogen.sh
+%configure
 
 %build
+pushd atomic-%{commit}
 make PYTHON=%{__python} PYLINT=true all
+popd
+
+pushd registries-%{commit_atomic_registries}
+%make_build
 
 %install
+pushd atomic-%{commit}
 make PYTHON=%{__python}  install-only DESTDIR=%{buildroot}
 install -dp %{buildroot}%{_sharedstatedir}/containers/%{name}
 
@@ -142,18 +176,46 @@ EOF
   '%{_datadir}/dbus-1/system-services/org.%{name}.service' \
   '%{_datadir}/polkit-1/actions/org.%{name}.policy' \
   '%{_mandir}/man1/%{name}*'
+popd
+
+pushd registries-%{commit_atomic_registries}
+%make_install
+install -d %{buildroot}%{_sysconfdir}/containers/
+install -p -m 644 registries.conf %{buildroot}%{_sysconfdir}/containers/
+install -d %{buildroot}%{_unitdir}
+install -p -m 644  registries.service %{buildroot}%{_unitdir}
+popd
+
 
 %check
+pushd atomic-%{commit}
 [ ! -w /run/docker.sock ] || make PYTHON=%{__python} test
+popd
 
-%files -f files
-%doc COPYING README.md
+#define license tag if not already defined
+%{!?_licensedir:%global license %doc}
+
+%files -f atomic-%{commit}/files
+%license atomic-%{commit}/COPYING
+%doc atomic-%{commit}/README.md
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.%{name}.conf
 %dir %{_sharedstatedir}/containers
 %dir %{_sharedstatedir}/containers/%{name}
 
+%files registries
+%license registries-%{commit_atomic_registries}/COPYING 
+%doc registries-%{commit_atomic_registries}/README.md
+%{_libexecdir}/registries
+%{_mandir}/man1/registries*
+%config(noreplace) %{_sysconfdir}/containers/registries.conf
+%{_unitdir}/registries.service
+
 %changelog
+* Wed May 17 2017 bbaude <bbaude@redhat.com> - 1.18.1
+- 1.18.1 release
+- Inclusion of the subpackage for registries
+
 * Tue May 16 2017 bbaude <bbaude@redhat.com> - 1.17.2-2
 - Fixes BZ# 1450307
 - Fixes BZ# 1451375
diff --git a/sources b/sources
index 2646460..b19d1bf 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (2760e30296884e9160ff0b8e58c2e5d47791f01d.tar.gz) = 6c842af0fffa3b3766d222b112f65aee074e5d3eb395bf5a80f5da032514770d083d79beb1d5a76af3cf477b6a45951850d96c193681f1c45f33a447b32d4bcc
+SHA512 (3c0cbc69eafffc6f9e192ebdaf48c05517ef130f.tar.gz) = 22832fe88615791b4ef724ad234a6608b1510d471ec9206c50d1269d59652c1e005a7db41aae74272c6099d4c0c0ef81b32d73295500c32aa54e946988166fb1
+SHA512 (dfdddb8e394631fb3e4d185d71e5f9b91df9e309.tar.gz) = 92af32c0e993e04191a418f06cf3fb07d518efcfa8638ca0b73fa7f788f818081d792c7e88a7b31209dfc9760471d22f33f0c31995d806969c3bad52ad4da09d