diff --git a/_service b/_service
index 8956b4d..8cdf1fa 100644
--- a/_service
+++ b/_service
@@ -7,10 +7,10 @@
     To update to a new release, change "revision" to the desired
     git commit hash and bump "version" if necessary
 
-    <param name="version">9.0.6</param>
+    <param name="version">9.0.7rc1</param>
 -->
-    <param name="versionformat">9.0.6+git.%h</param>
-    <param name="revision">08cda190c4f544a0c4e15ba792bbf47c69707b42</param>
+    <param name="versionformat">9.0.7rc1+git.%h</param>
+    <param name="revision">093821cd3aae36ee123744cc27a2ce548e3a13e9</param>
   </service>
 
   <service name="recompress" mode="disabled">
diff --git a/drbd-9.0.6+git.08cda19.tar.bz2 b/drbd-9.0.6+git.08cda19.tar.bz2
deleted file mode 100644
index a8bd493..0000000
--- a/drbd-9.0.6+git.08cda19.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7da9c1a0b94bb324115bca82b1297149552eb2fb3f00f59957a8d0c6a160e2b9
-size 299720
diff --git a/drbd-9.0.7rc1+git.093821cd.tar.bz2 b/drbd-9.0.7rc1+git.093821cd.tar.bz2
new file mode 100644
index 0000000..803321f
--- /dev/null
+++ b/drbd-9.0.7rc1+git.093821cd.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f156b4096ab7b8f0888dddac45cdeff8c858aa8d3247e3abb6461dc3aa018a03
+size 304453
diff --git a/drbd.changes b/drbd.changes
index 8257ff7..8104ce1 100644
--- a/drbd.changes
+++ b/drbd.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Fri Mar 24 07:44:01 UTC 2017 - nwang@suse.com
+
+- Update to 9.0.7rc1
+- various fixes to the 2-phase-commit online resize
+  fix fencing and disk state trasition and from consistent, necessary
+  for crm-fence-peer
+  fix calculation of authoritative nodes
+  Quorum to avoid data divergence, an alternative to fencing
+  Compat with Linux 4.10
+- Remove patch drbd_wrapper-Blank-out-WRITE_SYNC-warning-for-new-ke.patch
+- Add fix-resync-finished-with-syncs-have-bits-set.patch for bsc#1025089
+- Including the compatible fix of bsc#1031299
+
+-------------------------------------------------------------------
+Mon Mar  6 16:14:45 CET 2017 - hare@suse.de
+
+- Compability fixes for SLE12 SP3 (bsc#993388, FATE#321732)
+- Add patch drbd_wrapper-Blank-out-WRITE_SYNC-warning-for-new-ke.patch
+
 -------------------------------------------------------------------
 Thu Feb 16 06:56:53 UTC 2017 - nwang@suse.com
 
diff --git a/drbd.spec b/drbd.spec
index 90138e1..53f130c 100644
--- a/drbd.spec
+++ b/drbd.spec
@@ -25,7 +25,7 @@
 %endif
 
 Name:           drbd
-Version:        9.0.6+git.08cda19
+Version:        9.0.7rc1+git.093821cd
 Release:        0
 Summary:        DRBD driver for Linux
 License:        GPL-2.0
@@ -36,11 +36,12 @@ Source1:        preamble
 #In kernel is: kernel/drivers/block/drbd/drbd.ko
 Source2:        Module.supported
 Source3:        drbd_git_revision
+Patch1:         fix-resync-finished-with-syncs-have-bits-set.patch
 BuildRequires:  kernel-source
 BuildRequires:  kernel-syms
 BuildRequires:  module-init-tools
-Requires:       drbd-utils >= 8.9.6
-Supplements:    drbd-utils >= 8.9.6
+Requires:       drbd-utils >= 8.9.9
+Supplements:    drbd-utils >= 8.9.9
 Obsoletes:      drbd-kmp < %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExcludeArch:    i586 s390
@@ -67,6 +68,7 @@ installed kernel.
 
 %prep
 %setup -q -n drbd-%{version}
+%patch1 -p1
 
 mkdir source
 cp -a drbd/. source/. || :
diff --git a/fix-resync-finished-with-syncs-have-bits-set.patch b/fix-resync-finished-with-syncs-have-bits-set.patch
new file mode 100644
index 0000000..d489ea1
--- /dev/null
+++ b/fix-resync-finished-with-syncs-have-bits-set.patch
@@ -0,0 +1,13 @@
+diff -Naur drbd-9.0.7rc1+git.093821cd.orig/drbd/drbd_receiver.c drbd-9.0.7rc1+git.093821cd/drbd/drbd_receiver.c
+--- drbd-9.0.7rc1+git.093821cd.orig/drbd/drbd_receiver.c	2017-03-24 16:55:42.169376092 +0800
++++ drbd-9.0.7rc1+git.093821cd/drbd/drbd_receiver.c	2017-03-24 16:56:51.137239174 +0800
+@@ -6240,7 +6240,8 @@
+ 		/* if peer_state changes to connected at the same time,
+ 		 * it explicitly notifies us that it finished resync.
+ 		 * Maybe we should finish it up, too? */
+-		else if (peer_state.conn == L_ESTABLISHED) {
++		else if (peer_state.conn == L_ESTABLISHED &&
++		        peer_disk_state > D_NEGOTIATING) {
+ 			bool finish_now = false;
+ 
+ 			if (old_peer_state.conn == L_WF_BITMAP_S) {