diff --git a/drbd-utils.changes b/drbd-utils.changes
index ba621ad..5742584 100644
--- a/drbd-utils.changes
+++ b/drbd-utils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Dec  6 08:06:00 UTC 2016 - nwang@suse.com
+
+- bsc#1006105, initialize node id when creating md. 
+- Add patch initialize-node-id-when-create-md.patch
+
 -------------------------------------------------------------------
 Wed Aug  3 03:39:18 UTC 2016 - nwang@suse.com
 
diff --git a/drbd-utils.spec b/drbd-utils.spec
index c900dcf..69c31e4 100644
--- a/drbd-utils.spec
+++ b/drbd-utils.spec
@@ -33,6 +33,7 @@ Patch4:         service-mod.patch
 Patch5:         fence-after-pacemaker-down.patch
 Patch6:         support-drbd9-ra.patch
 Patch7:         fix-segfault-up-stacked-resource.patch
+Patch8:         initialize-node-id-when-create-md.patch
 
 Provides:       drbd-bash-completion = %{version}
 Provides:       drbd-pacemaker = %{version}
@@ -82,6 +83,7 @@ raid 1. It is a building block for setting up clusters.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 ./autogen.sh
diff --git a/initialize-node-id-when-create-md.patch b/initialize-node-id-when-create-md.patch
new file mode 100644
index 0000000..4b98116
--- /dev/null
+++ b/initialize-node-id-when-create-md.patch
@@ -0,0 +1,19 @@
+---
+ user/shared/drbdmeta.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/user/shared/drbdmeta.c b/user/shared/drbdmeta.c
+index fd8cc17..e8089f8 100644
+--- a/user/shared/drbdmeta.c
++++ b/user/shared/drbdmeta.c
+@@ -3845,6 +3845,7 @@ void md_convert_08_to_09(struct format *cfg)
+ 
+ 	cfg->md.flags &= ~(MDF_CONNECTED_IND | MDF_FULL_SYNC | MDF_PEER_OUT_DATED);
+ 
++	cfg->md.node_id = -1;
+ 	cfg->md.magic = DRBD_MD_MAGIC_09;
+ 	re_initialize_md_offsets(cfg);
+ 
+-- 
+1.8.5.6
+