diff --git a/conf/turnkey.d/networking b/conf/turnkey.d/networking
new file mode 100755
index 00000000..1c76f87d
--- /dev/null
+++ b/conf/turnkey.d/networking
@@ -0,0 +1,13 @@
+#!/bin/bash -e
+
+# it should be enabled by default but doesn't appear to be?
+systemctl enable networking.service
+
+if ! grep -s '^noarp' /etc/dhcpcd.conf; then
+    cat >> /etc/dhcpcd.conf <<EOF
+
+# disable ARP probe - consistent behavior with udhcpd & works around slow
+# network start on boot for some buggy DHCP implementations
+noarp
+EOF
+fi
diff --git a/overlays/turnkey.d/interfaces/etc/network/interfaces b/overlays/turnkey.d/interfaces/etc/network/interfaces
index 50435040..ba3b9902 100644
--- a/overlays/turnkey.d/interfaces/etc/network/interfaces
+++ b/overlays/turnkey.d/interfaces/etc/network/interfaces
@@ -6,8 +6,10 @@ iface lo inet loopback
 
 auto eth0
 iface eth0 inet dhcp
+iface eth0 inet6 dhcp
  hostname _UNCONFIGURED_
 
 allow-hotplug eth1
 iface eth1 inet dhcp
+iface eth1 inet6 dhcp
  hostname _UNCONFIGURED_
diff --git a/overlays/turnkey.d/udhcpc-fix/etc/udhcpc/default.script b/overlays/turnkey.d/udhcpc-fix/etc/udhcpc/default.script
deleted file mode 100755
index a9a3e977..00000000
--- a/overlays/turnkey.d/udhcpc-fix/etc/udhcpc/default.script
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-# Busybox udhcpc dispatcher script. Copyright (C) 2009 by Axel Beckert.
-#
-# Based on the busybox example scripts and the old udhcp source
-# package default.* scripts.
-
-RESOLV_CONF="/etc/resolv.conf"
-
-case $1 in
-    bound|renew)
-    [ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
-    [ -n "$subnet" ] && NETMASK="netmask $subnet"
-
-    /sbin/ifconfig $interface $ip $BROADCAST $NETMASK
-
-    if [ -n "$router" ]; then
-        echo "$0: Resetting default routes"
-        while /sbin/route del default gw 0.0.0.0 dev $interface; do :; done
-
-        metric=0
-        for i in $router; do
-        if [ "$subnet" = "255.255.255.255" ]; then
-            /sbin/ip route add default via $i dev $interface metric $metric onlink
-        else
-            /sbin/ip route add default via $i dev $interface metric $metric
-        fi
-        metric=$(($metric + 1))
-        done
-    fi
-
-    # Update resolver configuration file
-    R=""
-    [ -n "$domain" ] && R="domain $domain
-"
-    for i in $dns; do
-        echo "$0: Adding DNS $i"
-        R="${R}nameserver $i
-"
-    done
-
-    if [ -x /sbin/resolvconf ]; then
-        echo -n "$R" | resolvconf -a "${interface}.udhcpc"
-    else
-        echo -n "$R" > "$RESOLV_CONF"
-    fi
-    ;;
-
-    deconfig)
-    if [ -x /sbin/resolvconf ]; then
-        resolvconf -d "${interface}.udhcpc"
-    fi
-    /sbin/ifconfig $interface 0.0.0.0
-    ;;
-
-    leasefail)
-    echo "$0: Lease failed: $message"
-    ;;
-
-    nak)
-    echo "$0: Received a NAK: $message"
-    ;;
-
-    *)
-    echo "$0: Unknown udhcpc command: $1";
-    exit 1;
-    ;;
-esac
diff --git a/plans/net b/plans/net
index 8f302c3d..521029fb 100644
--- a/plans/net
+++ b/plans/net
@@ -5,6 +5,6 @@ bind9-host           # Version of 'host' bundled with BIND 9.X
 netbase              # Basic TCP/IP networking system
 net-tools            # The NET-3 networking toolkit
 iproute2             # networking and traffic control tools
-udhcpc               # very small DHCP client
+dhcpcd-base          # A very small DHCPv4 and DHCPv6 client
 traceroute           # Traces the route taken by packets over a tcp/ip network
 iputils-ping         # Tools to test the reachability of network hosts