diff --git a/_servicedata b/_servicedata
index 0d381aa..5849d74 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
             <param name="url">git://github.com/SUSE/ceph.git</param>
-          <param name="changesrevision">9f667dc3351c4c5388389f825097d7e178f6177e</param></service></servicedata>
\ No newline at end of file
+          <param name="changesrevision">6984d41b5d142ce157216b6e757bcb547da2c7d2</param></service></servicedata>
\ No newline at end of file
diff --git a/ceph-12.0.3+git.1496909744.9f667dc335.tar.bz2 b/ceph-12.0.3+git.1496909744.9f667dc335.tar.bz2
deleted file mode 100644
index 14956d4..0000000
--- a/ceph-12.0.3+git.1496909744.9f667dc335.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8522307cc99ecadc1c99f177e693a9d1011c941caf1ef684f7710359b9f880e9
-size 127006217
diff --git a/ceph-12.0.3+git.1497426468.6984d41b5d.tar.bz2 b/ceph-12.0.3+git.1497426468.6984d41b5d.tar.bz2
new file mode 100644
index 0000000..0c3065e
--- /dev/null
+++ b/ceph-12.0.3+git.1497426468.6984d41b5d.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:33358f6da2c904b64b8325aa1b498f34eef3f67eb249c6b371dbce0f5710836e
+size 127017792
diff --git a/ceph-test.changes b/ceph-test.changes
index ab199a3..0acfc88 100644
--- a/ceph-test.changes
+++ b/ceph-test.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed Jun 14 08:00:43 UTC 2017 - ncutler@suse.com
+
+- Update to version 12.0.3+git.1497426468.6984d41b5d:
+  + qa: add initial deepsea suite (task and test yaml)
+  + fix "ceph osd df" (regression in latest upstream master) (pr#15675, issue#20256)
+    * mon: move creating_pgs and reweight_by_utilization into new MonPGStatService
+    * mon: move most PGMapStatService into PGMap; rename PGMon's to PGMonStatService
+    * mon: mgr: move 'osd df' handling to manager
+    * mon: inherit PGMonStatService from the PGMapStatService
+    * move the OSDUtilizationDumper code into OSDMap
+    * mon: mgr: enable "osd df" on the manager
+    * qa: add a check_commands.sh script which looks for commands with no tests
+    * qa: test 'osd df' in cephtool/test.sh
+
 -------------------------------------------------------------------
 Thu Jun 08 08:36:57 UTC 2017 - ncutler@suse.com
 
diff --git a/ceph-test.spec b/ceph-test.spec
index f43c5ec..ccf62de 100644
--- a/ceph-test.spec
+++ b/ceph-test.spec
@@ -69,7 +69,7 @@
 # main package definition
 #################################################################################
 Name: ceph-test
-Version: 12.0.3+git.1496909744.9f667dc335
+Version: 12.0.3+git.1497426468.6984d41b5d
 Release: 0%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch: 1
diff --git a/ceph.changes b/ceph.changes
index ab199a3..0acfc88 100644
--- a/ceph.changes
+++ b/ceph.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed Jun 14 08:00:43 UTC 2017 - ncutler@suse.com
+
+- Update to version 12.0.3+git.1497426468.6984d41b5d:
+  + qa: add initial deepsea suite (task and test yaml)
+  + fix "ceph osd df" (regression in latest upstream master) (pr#15675, issue#20256)
+    * mon: move creating_pgs and reweight_by_utilization into new MonPGStatService
+    * mon: move most PGMapStatService into PGMap; rename PGMon's to PGMonStatService
+    * mon: mgr: move 'osd df' handling to manager
+    * mon: inherit PGMonStatService from the PGMapStatService
+    * move the OSDUtilizationDumper code into OSDMap
+    * mon: mgr: enable "osd df" on the manager
+    * qa: add a check_commands.sh script which looks for commands with no tests
+    * qa: test 'osd df' in cephtool/test.sh
+
 -------------------------------------------------------------------
 Thu Jun 08 08:36:57 UTC 2017 - ncutler@suse.com
 
diff --git a/ceph.spec b/ceph.spec
index feea454..f25a27d 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -69,7 +69,7 @@
 # main package definition
 #################################################################################
 Name:		ceph
-Version:	12.0.3+git.1496909744.9f667dc335
+Version:	12.0.3+git.1497426468.6984d41b5d
 Release:	0%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		1