diff --git a/docker.changes b/docker.changes
index 7551508..8df470a 100644
--- a/docker.changes
+++ b/docker.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 11 12:47:16 UTC 2017 - jmassaguerpla@suse.com
+
+- add "a wait" when starting docker service to fix
+  bsc#1019251 
+
 -------------------------------------------------------------------
 Tue Dec 20 12:41:33 UTC 2016 - normand@linux.vnet.ibm.com
 
diff --git a/docker.service b/docker.service
index dd081f2..f87ec47 100644
--- a/docker.service
+++ b/docker.service
@@ -10,7 +10,9 @@ EnvironmentFile=/etc/sysconfig/docker
 # While Docker has support for socket activation (-H fd://), this is not
 # enabled by default because enabling socket activation means that on boot your
 # containers won't start until someone tries to administer the Docker daemon.
+Type=simple
 ExecStart=/usr/bin/dockerd --containerd /run/containerd/containerd.sock $DOCKER_NETWORK_OPTIONS $DOCKER_OPTS
+ExecStartPost=/usr/lib/docker/docker_service_helper.sh wait
 ExecReload=/bin/kill -s HUP $MAINPID
 
 # Having non-zero Limit*s causes performance problems due to accounting overhead
diff --git a/docker.spec b/docker.spec
index 9904640..bda3aa8 100644
--- a/docker.spec
+++ b/docker.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package docker
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -59,6 +59,7 @@ Source7:        README_SUSE.md
 Source8:        docker-audit.rules
 Source9:        docker-update-message.txt
 Source10:       tests.sh
+Source11:       docker_service_helper.sh 
 # Fixes for architecture-specific issues (gcc-go).
 Patch100:       gcc-go-patches.patch
 Patch102:       netlink_netns_powerpc.patch
@@ -316,6 +317,7 @@ cp -av tests.main tests.sh %{buildroot}%{_prefix}/src/docker/hack/
 #
 install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
 ln -sf service %{buildroot}%{_sbindir}/rcdocker
+install -D -m 0755 %{SOURCE11} %{buildroot}/%{_libexecdir}/docker/
 
 #
 # udev rules that prevents dolphin to show all docker devices and slows down
diff --git a/docker_service_helper.sh b/docker_service_helper.sh
new file mode 100644
index 0000000..fec7513
--- /dev/null
+++ b/docker_service_helper.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+if [ "$1" != "wait" ];then
+    echo "Usage $0 option"
+    echo "options can be"
+    echo "  wait: wait for the daemon to start"
+    exit -1
+fi
+
+echo "Waiting for docker daemon to start"
+for i in {1..60};do
+    docker version > /dev/null 2>&1 && break
+    sleep 1
+done
+if docker version > /dev/null 2>&1;then
+    echo "Docker is alive"
+    exit 0
+else
+    echo  "Docker is dead"
+    exit 1
+fi
+