diff --git a/_service b/_service
index e8a805d..999cd00 100644
--- a/_service
+++ b/_service
@@ -6,7 +6,7 @@
     <param name="filename">ceph</param>
     <param name="scm">git</param>
     <param name="package-meta">no</param>
-    <param name="changesgenerate">enable</param>
+    <param name="changesgenerate">disable</param>
     <param name="commandtorun">sh etc/ceph_ver_hack.sh</param>
   </service>
   <service name="extract_ceph_spec" mode="disabled" />
diff --git a/_servicedata b/_servicedata
index 40eb723..f63ea3b 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">410e200be5f33c0f2079a3ad1c0cbc2464236e53</param></service></servicedata>
\ No newline at end of file
+          <param name="changesrevision">165c23f778c4e87a5bb6b05d4ec4eb3795246ffa</param></service></servicedata>
diff --git a/ceph-12.0.0+git.1489159457.410e200.tar.bz2 b/ceph-12.0.0+git.1489159457.410e200.tar.bz2
deleted file mode 100644
index 5f6dde0..0000000
--- a/ceph-12.0.0+git.1489159457.410e200.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:86c397c17e3fd6743368d7349bece0faf35f166dad3d3aec0ae1ae67c7498e53
-size 103823168
diff --git a/ceph-12.0.0+git.1489432599.165c23f.tar.bz2 b/ceph-12.0.0+git.1489432599.165c23f.tar.bz2
new file mode 100644
index 0000000..9fb91d9
--- /dev/null
+++ b/ceph-12.0.0+git.1489432599.165c23f.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5d66f1557f57cac3a913e8f6096e000ae4a4716121bf86df0596a17ba8b81942
+size 104085476
diff --git a/ceph-test.changes b/ceph-test.changes
index ec224c4..eeb24da 100644
--- a/ceph-test.changes
+++ b/ceph-test.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Mar 14 12:09:01 UTC 2017 - ncutler@suse.com
+
+- Update to version 12.0.0+git.1489432599.165c23f:
+  + merge upstream master (0c2f5f7214d2410a7519f88e65ed5273d6480227)
+    including fix for upstream issue#18694 "ceph-disk activate for partition
+    failing"
+
 -------------------------------------------------------------------
 Fri Mar 10 15:55:53 UTC 2017 - ncutler@suse.com
 
diff --git a/ceph-test.spec b/ceph-test.spec
index 4e1fcc9..8d79b14 100644
--- a/ceph-test.spec
+++ b/ceph-test.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ceph
 #
-# Copyright (C) 2004-2016 The Ceph Project Developers. See COPYING file
+# Copyright (C) 2004-2017 The Ceph Project Developers. See COPYING file
 # at the top-level directory of this distribution and at
 # https://github.com/ceph/ceph/blob/master/COPYING
 #
@@ -13,6 +13,7 @@
 #
 # Please submit bugfixes or comments via http://tracker.ceph.com/
 #
+%bcond_without ocf
 %bcond_with cephfs_java
 %if 0%{?suse_version}
 %bcond_without ceph_test_package
@@ -62,12 +63,13 @@
 # unify libexec for all targets
 %global _libexecdir %{_exec_prefix}/lib
 
-
+# disable dwz which compresses the debuginfo
+%global _find_debuginfo_dwz_opts %{nil}
 #################################################################################
-# common
+# main package definition
 #################################################################################
 Name: ceph-test
-Version: 12.0.0+git.1489159457.410e200
+Version: 12.0.0+git.1489432599.165c23f
 Release: 0
 Summary: Ceph benchmarks and test tools
 License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT
@@ -142,6 +144,7 @@ BuildRequires:	xfsprogs
 BuildRequires:	xfsprogs-devel
 BuildRequires:	xmlstarlet
 BuildRequires:	yasm
+BuildRequires:	libibverbs-devel
 
 #################################################################################
 # distro-conditional dependencies
@@ -216,7 +219,7 @@ BuildRequires:  libxio-devel
 This package contains Ceph benchmarks and test tools.
 
 #################################################################################
-# packages
+# subpackages
 #################################################################################
 %if 0%{?suse_version}
 %endif
diff --git a/ceph.changes b/ceph.changes
index ec224c4..eeb24da 100644
--- a/ceph.changes
+++ b/ceph.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Mar 14 12:09:01 UTC 2017 - ncutler@suse.com
+
+- Update to version 12.0.0+git.1489432599.165c23f:
+  + merge upstream master (0c2f5f7214d2410a7519f88e65ed5273d6480227)
+    including fix for upstream issue#18694 "ceph-disk activate for partition
+    failing"
+
 -------------------------------------------------------------------
 Fri Mar 10 15:55:53 UTC 2017 - ncutler@suse.com
 
diff --git a/ceph.spec b/ceph.spec
index 5241ac9..0567179 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ceph
 #
-# Copyright (C) 2004-2016 The Ceph Project Developers. See COPYING file
+# Copyright (C) 2004-2017 The Ceph Project Developers. See COPYING file
 # at the top-level directory of this distribution and at
 # https://github.com/ceph/ceph/blob/master/COPYING
 #
@@ -13,6 +13,7 @@
 #
 # Please submit bugfixes or comments via http://tracker.ceph.com/
 # 
+%bcond_without ocf
 %bcond_with cephfs_java
 %if 0%{?suse_version}
 %bcond_with ceph_test_package
@@ -62,12 +63,13 @@
 # unify libexec for all targets
 %global _libexecdir %{_exec_prefix}/lib
 
-
+# disable dwz which compresses the debuginfo
+%global _find_debuginfo_dwz_opts %{nil}
 #################################################################################
-# common
+# main package definition
 #################################################################################
 Name:		ceph
-Version:	12.0.0+git.1489159457.410e200
+Version:	12.0.0+git.1489432599.165c23f
 Release:	0
 Summary:	User space components of the Ceph file system
 License:	LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT
@@ -138,6 +140,7 @@ BuildRequires:	xfsprogs
 BuildRequires:	xfsprogs-devel
 BuildRequires:	xmlstarlet
 BuildRequires:	yasm
+BuildRequires:	libibverbs-devel
 
 #################################################################################
 # distro-conditional dependencies
@@ -214,7 +217,7 @@ on commodity hardware and delivers object, block and file system storage.
 
 
 #################################################################################
-# packages
+# subpackages
 #################################################################################
 %package base
 Summary:       Ceph Base Package
@@ -238,6 +241,7 @@ Requires:      logrotate
 Requires:      util-linux
 Requires:      cryptsetup
 Requires:      findutils
+Requires:      psmisc
 Requires:      which
 %if 0%{?suse_version}
 Recommends:    ntp-daemon