diff --git a/hyper-v.changes b/hyper-v.changes
index 104ad6f..5ee0b75 100644
--- a/hyper-v.changes
+++ b/hyper-v.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jul 24 10:18:34 CEST 2013 - ohering@suse.de
+
+- set BOOTPROTO=static if any IPADDR/IP6ADDR was passed to 
+  hv_set_ifconfig and dhcp is disabled
+
 -------------------------------------------------------------------
 Mon Jul 15 16:16:06 CEST 2013 - ohering@suse.de
 
diff --git a/hyper-v.tools.hv.hv_set_ifconfig.sh b/hyper-v.tools.hv.hv_set_ifconfig.sh
index 695652f..e3ccd56 100644
--- a/hyper-v.tools.hv.hv_set_ifconfig.sh
+++ b/hyper-v.tools.hv.hv_set_ifconfig.sh
@@ -95,6 +95,9 @@ fi
 	if test "${BOOTPROTO}" = "dhcp"
 	then
 		echo "BOOTPROTO=dhcp"
+	elif test -n "${!IPADDR*}${!IPV6ADDR*}"
+	then
+		echo "BOOTPROTO=static"
 	fi
 	# single index for all ipv4 and ipv6 adresses in final ifcfg file
 	i=0