diff --git a/.atomic.metadata b/.atomic.metadata
index 21f12c2..8fbc033 100644
--- a/.atomic.metadata
+++ b/.atomic.metadata
@@ -1 +1 @@
-466b2c9d171a100aa2c563f2fb587536d447dced SOURCES/b182dbd34b9479ba4b3a6059389bb1d1198599f3.tar.gz
+075b9aec68119d72e8efdb1e40989edd54ae4669 SOURCES/a21f0bc7a69baafb87d247ad87a6eabfb551d431.tar.gz
diff --git a/.gitignore b/.gitignore
index 0cd2107..c156b55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/b182dbd34b9479ba4b3a6059389bb1d1198599f3.tar.gz
+SOURCES/a21f0bc7a69baafb87d247ad87a6eabfb551d431.tar.gz
diff --git a/SOURCES/fix-re-module-bug.patch b/SOURCES/fix-re-module-bug.patch
new file mode 100644
index 0000000..824c075
--- /dev/null
+++ b/SOURCES/fix-re-module-bug.patch
@@ -0,0 +1,38 @@
+From df95392e3bd6d8d7f85f5588ada8451fc0b36266 Mon Sep 17 00:00:00 2001
+From: Aaron Weitekamp <aweiteka@redhat.com>
+Date: Tue, 14 Feb 2017 09:58:40 -0500
+Subject: [PATCH] fix re module bug
+
+Closes: #891
+Approved by: rhatdan
+---
+ Atomic/util.py          | 2 +-
+ tests/unit/test_util.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Atomic/util.py b/Atomic/util.py
+index b75327a..d374dd8 100644
+--- a/Atomic/util.py
++++ b/Atomic/util.py
+@@ -750,7 +750,7 @@ def is_valid_image_uri(uri, qualifying=None):
+     # does it parse?
+     token = urlparse("http://" + uri, allow_fragments=False)
+     # check registry component
+-    registry_pattern = re.compile(r'^[a-zA-Z0-9-_\.]+:?([0-9]*)?$')
++    registry_pattern = re.compile(r'^[a-zA-Z0-9-_\.]+\/?:?[0-9]*[a-z0-9-\/:]*$')
+     if not re.search(registry_pattern, token.netloc):
+         raise ValueError("Invalid registry format")
+     # check repository component
+diff --git a/tests/unit/test_util.py b/tests/unit/test_util.py
+index a940cf3..d552cbd 100644
+--- a/tests/unit/test_util.py
++++ b/tests/unit/test_util.py
+@@ -90,7 +90,7 @@ def test_decompose(self):
+     @unittest.skipUnless(new_enough, "Requires 2.7.6 or newer")
+     def test_valid_uri(self):
+         valid_uris = ['example.com', 'example.com:5000', 'example.US.com', 'example.com/image/name:version1', 'example.com:5000/foo/bar/image:tag', 'example_inc.com']
+-        invalid_uris = ['example.com/Image/name', 'example.com/image(name):latest', 'example.com/foo_bar', 'example.com:5000:8888', 'example.com:foo', 'example[us].com', 'example.com#foo/bar']
++        invalid_uris = ['example.com/Image/name', 'example.com/image(name):latest', 'example.com/foo_bar', 'example[us].com', 'example.com#foo/bar']
+         for uri in valid_uris:
+             self.assertTrue(util.is_valid_image_uri(uri))
+ 
diff --git a/SPECS/atomic.spec b/SPECS/atomic.spec
index 8fb1cd2..0557889 100644
--- a/SPECS/atomic.spec
+++ b/SPECS/atomic.spec
@@ -13,18 +13,19 @@
 %global pylint python3-pylint
 %endif
 
-%global commit0 b182dbd34b9479ba4b3a6059389bb1d1198599f3
+%global commit0 a21f0bc7a69baafb87d247ad87a6eabfb551d431
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 Name: atomic
 Epoch: 1
-Version: 1.14.1
-Release: 5%{?dist}
+Version: 1.15.4
+Release: 2%{?dist}
 Summary: Tool for managing ProjectAtomic systems and containers
 License: LGPLv2+
 URL: https://github.com/projectatomic/%{name}
 ExclusiveArch: x86_64
 Source0: https://github.com/projectatomic/%{name}/archive/%{commit0}.tar.gz
+Patch0: fix-re-module-bug.patch
 
 BuildRequires: %{pypkg}-dateutil
 BuildRequires: %{pypkg}-devel
@@ -43,7 +44,6 @@ BuildRequires: rpm-%{pypkg}
 BuildRequires: PyYAML
 
 Requires: dbus
-Requires: docker
 Requires: polkit
 Requires: setup
 Requires: rpm-%{pypkg}
@@ -65,12 +65,10 @@ Requires: gomtree
 The goal of Atomic is to provide a high level, coherent entrypoint to the
 system, and fill in gaps.
 
-For Docker, atomic can make it easier to interact with special kinds of
-containers, such as super-privileged debugging tools and the like.
-
-The atomic host subcommand wraps rpm-ostree, currently just providing a
-friendlier name, but in the future Atomic may provide more unified
-management.
+atomic can make it easier to interact with container runtimes for different
+kinds of containers, such as super-privileged and system containers.
+ 
+The atomic host subcommand wraps rpm-ostree providing unified management.
 
 %prep
 %autosetup -Sgit -n %{name}-%{commit0}
@@ -132,6 +130,31 @@ rm -rf %{buildroot}%{_sysconfdir}/containers
 %dir %{_sysconfdir}/%{name}.d
 
 %changelog
+* Wed Feb 15 2017 Lokesh Mandvekar <lsm5@redhat.com> - 1:1.15.4-2
+- built commit a21f0bc + re module bug patch
+
+* Wed Feb 15 2017 Lokesh Mandvekar <lsm5@redhat.com> - 1:1.15.4-1
+- Resolves: #1420532
+- bump to v1.15.4
+- built commit d56dcfb
+
+* Mon Feb 13 2017 Lokesh Mandvekar <lsm5@redhat.com> - 1:1.15.3-1
+- Resolves: #1421918
+- bump to v1.15.3
+- built commit a21f0bc
+
+* Tue Feb 07 2017 Lokesh Mandvekar <lsm5@redhat.com> - 1:1.15.2-4
+- built commit 2ebeb1d
+
+* Tue Jan 31 2017 Dan Walsh <dwalsh@redhat.com> - 1.15.2-3
+- Remove requires docker.
+
+* Tue Jan 31 2017 Frantisek Kluknavsky <fkluknav@redhat.com> - 1:1.15.2-2
+- v1.15.2 tag changed upstream, rebase
+
+* Mon Jan 23 2017 Frantisek Kluknavsky <fkluknav@redhat.com> - 1:1.15.2-1
+- rebase to v1.15.2
+
 * Tue Jan 03 2017 Lokesh Mandvekar <lsm5@redhat.com> - 1:1.14.1-5
 - revert python-docker-py version requirement to what existed prior
 to enforcing >= 1.10.6