diff --git a/_service b/_service
index a77e903..0948918 100644
--- a/_service
+++ b/_service
@@ -3,8 +3,8 @@
     <param name="url">https://github.com/docker/docker.git</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
-    <param name="versionformat">1.12.3</param>
-    <param name="revision">v1.12.3</param>
+    <param name="versionformat">1.12.5</param>
+    <param name="revision">v1.12.5</param>
   </service>
   <service name="recompress" mode="disabled">
     <param name="file">docker-*.tar</param>
diff --git a/docker-1.12.3.tar.xz b/docker-1.12.3.tar.xz
deleted file mode 100644
index 1057cd2..0000000
--- a/docker-1.12.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:096dec850ed5124d9b822eb0dc84291a5ecbd5641ae6295eb228850d8b7805ba
-size 11188896
diff --git a/docker-1.12.5.tar.xz b/docker-1.12.5.tar.xz
new file mode 100644
index 0000000..a16d2d6
--- /dev/null
+++ b/docker-1.12.5.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:23c2068ecc2a8a283338143c76ffaf6987a93df767f7f6b6927f73310915485d
+size 11190552
diff --git a/docker.changes b/docker.changes
index 6db99c0..e87ed89 100644
--- a/docker.changes
+++ b/docker.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Dec 19 12:41:13 UTC 2016 - jmassaguerpla@suse.com
+
+- update docker to 1.12.5 (bsc#1016307).
+  This fixes bsc#1015661 
+
 -------------------------------------------------------------------
 Mon Dec  5 14:52:02 UTC 2016 - jmassaguerpla@suse.com
 
diff --git a/docker.spec b/docker.spec
index f157e07..56b04cd 100644
--- a/docker.spec
+++ b/docker.spec
@@ -36,7 +36,7 @@
 %global docker_migration_warnfile %{docker_store}/docker-update-message.txt
 %define docker_graph              %{docker_store}/graph
 %define git_version 8eab29e
-%define version_unconverted 1.12.3
+%define version_unconverted 1.12.5
 %define docker_version 1.12.1
 %define __arch_install_post export NO_BRP_STRIP_DEBUG=true
 # When upgrading to a new version requires the service not to be restarted
@@ -45,7 +45,7 @@
 # 1.10.1
 %global last_migration_version 1.10.1
 Name:           docker
-Version:        1.12.3
+Version:        1.12.5
 Release:        0
 Summary:        The Linux container runtime
 License:        Apache-2.0
@@ -87,8 +87,8 @@ Requires:       ca-certificates-mozilla
 # execdrivers of Docker. NOTE: The version pinning here matches upstream's
 # Dockerfile to ensure that we don't use a slightly incompatible version of
 # runC or containerd (which would be bad).
-Requires:       containerd = 0.2.4+gitr565_0366d7e
-Requires:       runc = 0.1.1+gitr2816_02f8fa7
+Requires:       containerd = 0.2.5+gitr569_2a5e70c
+Requires:       runc = 0.1.1+gitr2818_f59ba3cdd76f
 # Provides mkfs.ext4 - used by Docker when devicemapper storage driver is used
 Requires:       e2fsprogs
 Requires:       git-core >= 1.7