diff --git a/hyper-v.changes b/hyper-v.changes
index 2fb697e..42ec751 100644
--- a/hyper-v.changes
+++ b/hyper-v.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jul 15 12:04:05 CEST 2013 - ohering@suse.de
+
+- Fix a bug in IPV6 subnet enumeration (bnc#828714)
+
 -------------------------------------------------------------------
 Tue Mar 26 18:03:47 CET 2013 - ohering@suse.de
 
diff --git a/hyper-v.tools.hv.hv_kvp_daemon.c b/hyper-v.tools.hv.hv_kvp_daemon.c
index 272a3ea..bf5de4e 100644
--- a/hyper-v.tools.hv.hv_kvp_daemon.c
+++ b/hyper-v.tools.hv.hv_kvp_daemon.c
@@ -1012,9 +1012,10 @@ kvp_get_ip_info(int family, char *if_name, int op,
 
 				if (sn_offset == 0)
 					strcpy(sn_str, cidr_mask);
-				else
+				else {
+					strcat((char *)ip_buffer->sub_net, ";");
 					strcat(sn_str, cidr_mask);
-				strcat((char *)ip_buffer->sub_net, ";");
+				}
 				sn_offset += strlen(sn_str) + 1;
 			}