diff --git a/cloud-init-proper-ipv6-setting.patch b/cloud-init-proper-ipv6-setting.patch
new file mode 100644
index 0000000..7bf0025
--- /dev/null
+++ b/cloud-init-proper-ipv6-setting.patch
@@ -0,0 +1,10 @@
+--- cloudinit/net/sysconfig.py.orig
++++ cloudinit/net/sysconfig.py
+@@ -349,6 +349,7 @@ class Renderer(renderer.Renderer):
+                 # TODO need to set BOOTPROTO to dhcp6 on SUSE
+                 iface_cfg['IPV6INIT'] = True
+                 iface_cfg['DHCPV6C'] = True
++                iface_cfg['DHCLIENT6_MODE'] = 'managed'
+             elif subnet_type in ['dhcp4', 'dhcp']:
+                 iface_cfg['BOOTPROTO'] = 'dhcp'
+             elif subnet_type == 'static':
diff --git a/cloud-init.changes b/cloud-init.changes
index 426d2d4..fa5e427 100644
--- a/cloud-init.changes
+++ b/cloud-init.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Nov 25 19:34:52 UTC 2019 - Robert Schweikert <rjschwei@suse.com>
+
+- Add cloud-init-proper-ipv6-setting.patch (bsc#1156139)
+  + Set proper IPv6 interface variable in ifcfg file
+
 -------------------------------------------------------------------
 Wed Nov  6 14:43:54 UTC 2019 - Petr Pavlu <petr.pavlu@suse.com>
 
diff --git a/cloud-init.spec b/cloud-init.spec
index 0078244..53a1d1a 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -51,6 +51,7 @@ Patch51:        cloud-init-after-wicked.patch
 Patch52:        cloud-init-break-resolv-symlink.patch
 # FIXME (lp#1849378) expected in 19.3
 Patch53:        cloud-init-renderer-detect.patch
+Patch54:        cloud-init-proper-ipv6-setting.patch
 
 BuildRequires:  fdupes
 BuildRequires:  filesystem
@@ -198,6 +199,7 @@ Documentation and examples for cloud-init tools
 %patch51 -p1
 %patch52
 %patch53
+%patch54
 
 %build
 %if 0%{?suse_version} && 0%{?suse_version} <= 1315