diff --git a/overlays/ifupdown/internal/ifupdown_test.go b/overlays/ifupdown/internal/ifupdown_test.go
index 3d3377ce..3e1d9ec4 100644
--- a/overlays/ifupdown/internal/ifupdown_test.go
+++ b/overlays/ifupdown/internal/ifupdown_test.go
@@ -1,4 +1,4 @@
-package debian_interfaces
+package ifupdown
 
 import (
 	"bytes"
@@ -82,4 +82,8 @@ iface wwnet1 inet static
   gateway 192.168.3.1
   mtu 9000
   up ip route add 192.168.1.0/24 via 192.168.3.254 dev wwnet1
+iface wwnet1 inet6 static
+  address 2001:db8::23/64
+  gateway 2001:db8::1
+  mtu 9000
 `
diff --git a/overlays/ifupdown/internal/nodes.conf b/overlays/ifupdown/internal/nodes.conf
index 3ff766da..df712539 100644
--- a/overlays/ifupdown/internal/nodes.conf
+++ b/overlays/ifupdown/internal/nodes.conf
@@ -17,3 +17,6 @@ nodes:
         mtu: 9000
         tags:
           route1: "192.168.1.0/24,192.168.3.254"
+        ipaddr6: 2001:db8::23
+        prefixlen6: 64
+        gateway6: 2001:db8::1
diff --git a/overlays/ifupdown/rootfs/etc/network/interfaces.d/default.ww b/overlays/ifupdown/rootfs/etc/network/interfaces.d/default.ww
index ecc54df7..bd03c914 100644
--- a/overlays/ifupdown/rootfs/etc/network/interfaces.d/default.ww
+++ b/overlays/ifupdown/rootfs/etc/network/interfaces.d/default.ww
@@ -5,6 +5,7 @@
 auto {{ $netdev.Device }}
 {{- end }}
 allow-hotplug {{ $netdev.Device }}
+{{- if $netdev.Ipaddr }}
 iface {{ $netdev.Device }} inet static
   address {{ $netdev.Ipaddr }}
   netmask {{ $netdev.Netmask }}
@@ -15,4 +16,11 @@ iface {{ $netdev.Device }} inet static
   up ip route add {{ index (splitList "," $tv) 0 }} via {{ index (splitList "," $tv) 1 }} dev {{ $netdev.Device }}
   {{- end }}
   {{- end }}
+{{- end }}
+{{- if $netdev.Ipaddr6 }}
+iface {{ $netdev.Device }} inet6 static
+  address {{ $netdev.IpCIDR6 }}
+  {{ if $netdev.Gateway6 }}gateway {{ $netdev.Gateway6 }}{{ end }}
+  {{ if $netdev.MTU }}mtu {{ $netdev.MTU }}{{ end }}
+{{- end }}
 {{ end -}}