diff --git a/.gitignore b/.gitignore
index a907f3f..e3dfbb3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@
 /dfdddb8e394631fb3e4d185d71e5f9b91df9e309.tar.gz
 /1eff66fed361d26664783dffcc5ec765f1c33ad4.tar.gz
 /0705b1bde7d308988263cd5ef1106ce2901a7e00.tar.gz
+/c8b4191f1c86b3dd9caa7721e32f50141b977fe2.tar.gz
diff --git a/atomic.spec b/atomic.spec
index a6a7b5f..7cb0c77 100644
--- a/atomic.spec
+++ b/atomic.spec
@@ -16,13 +16,13 @@
 
 # Registries package
 %global git_atomic_registries https://github.com/projectatomic/registries
-%global commit_atomic_registries 1eff66fed361d26664783dffcc5ec765f1c33ad4
+%global commit_atomic_registries c8b4191f1c86b3dd9caa7721e32f50141b977fe2
 %global atomic_registries_shortcommit %(c=%{commit_atomic_registries}; echo ${c:0:7})
 
 
 Name: atomic
 Version: 1.18.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Tool for managing ProjectAtomic systems and containers
 License: LGPLv2+
 URL: https://github.com/projectatomic/atomic
@@ -121,28 +121,25 @@ BuildRequires: automake
 Utility that parses a global YAML registry file for container runtimes.
 
 %prep
-tar zxf %{SOURCE0}
+%setup -qn %{name}-%{commit}
+cd ..
 tar zxf %{SOURCE1}
-pushd atomic-%{commit}
-if [ %{pypkg} == 'python3' ]; then
-sed -i 's/input = raw_input/pass/' Atomic/util.py
-fi
-popd
 
+%build
+cd ..
 pushd registries-%{commit_atomic_registries}
 sh ./autogen.sh
 %configure
-
-%build
+%make_build
+popd
 pushd atomic-%{commit}
+if [ %{pypkg} == 'python3' ]; then
+    sed -i 's/input = raw_input/pass/' Atomic/util.py
+fi
 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}
 
@@ -163,7 +160,7 @@ for line in sys.argv[1:]:
     else:
         sys.stderr.write('{0} did not match any files\n'.format(line))
 EOF
-%{pypkg} autofiles.py > files \
+%{pypkg} autofiles.py > atomic.files \
   '%{pysitelib}/Atomic' \
   '%{pysitelib}/%{name}*.egg-info' \
   '%{_sysconfdir}/%{name}.conf' \
@@ -176,42 +173,58 @@ EOF
   '%{_datadir}/dbus-1/system-services/org.%{name}.service' \
   '%{_datadir}/polkit-1/actions/org.%{name}.policy' \
   '%{_mandir}/man1/%{name}*'
-popd
 
+cd ..
 pushd registries-%{commit_atomic_registries}
 %make_install
 install -d %{buildroot}%{_sysconfdir}/containers/
+%if 0%{?rhel}
+install -p -m 644 registries.redhat %{buildroot}%{_sysconfdir}/containers/registries.conf
+%else if 0%{?fedora}
+install -p -m 644 registries.fedora %{buildroot}%{_sysconfdir}/containers/registries.conf
+%else
 install -p -m 644 registries.conf %{buildroot}%{_sysconfdir}/containers/
+%endif
+
 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
+cd ..
+pushd registries-%{commit_atomic_registries}
+make check
+
 
 #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
+%files -f atomic.files
+%license COPYING
+%doc 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
+%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
+* Mon Jun 05 2017 bbaude <bbaude@redhat.com> - 1.18.1-3
+- Revert to using %setup again
+- BZ#1458431
+- Customized registries.conf file based on distro
+- Updated autoconf to make distro support easier
+- Run make check for atomic-registries
+
 * Thu Jun 1 2017 dwalsh <dwalsh@redhat.com> - 1.18.1-2
 - 1.18.1 release
 - Inclusion of the subpackage for registries
diff --git a/sources b/sources
index 82d92bd..894fbc5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (1eff66fed361d26664783dffcc5ec765f1c33ad4.tar.gz) = c47c162fc55ada3a55fae9ada9027e6d066df276593d8e2a6085a3d4a8d7465e59399e616760678052265e1e2c4510a8ce104df887d1a106512dc7ac6308dfdf
 SHA512 (0705b1bde7d308988263cd5ef1106ce2901a7e00.tar.gz) = ae00caa27ba60718faf6cb4bad111767533c108e3a66e6adb039683337ffe33f44af38184707821d496a8e11ab54e8de7006cabf46c195eecb5c6b6ed3bbefaa
+SHA512 (c8b4191f1c86b3dd9caa7721e32f50141b977fe2.tar.gz) = 73494cebaabcf3b0736e8388bba40722d3295eca1cc48b09e38da9c096b6d32e0e4e4efe8a68e1e8ede347316786988ab00efbef754910b29f4c4e8354666bc1