diff --git a/conf/machine/raspberrypi2.conf b/conf/machine/raspberrypi2.conf
index 1d4655e..f502034 100644
--- a/conf/machine/raspberrypi2.conf
+++ b/conf/machine/raspberrypi2.conf
@@ -22,9 +22,10 @@ QB_SYSTEM_NAME = "qemu-system-arm"
 QB_MACHINE = "-machine raspi2b"
 QB_MEM = "-m 1024"
 QB_DTB = "bcm2709-rpi-2-b.dtb"
-QB_NET = "none"
-QB_KERNEL_ROOT = "/dev/mmcblk0"
-QB_KERNEL_CMDLINE_APPEND = "rootwait"
+QB_NETWORK_DEVICE = "-device usb-net,netdev=net0,mac=@MAC@"
+QB_KERNEL_ROOT = "/dev/sda"
+# The dwc_otg.fiq_fsm_enable setting is necessary to get USB devices (both disk and net) working.  Without this, boot hangs
+QB_KERNEL_CMDLINE_APPEND = "rootwait earlycon=pl011,0x3f201000 dwc_otg.fiq_fsm_enable=0"
 QB_RNG = ""
-QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=sd,format=raw"
+QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device usb-storage,drive=disk0"
 QB_DEFAULT_FSTYPE = "ext3"
diff --git a/recipes-core/init-ifupdown/files/interfaces b/recipes-core/init-ifupdown/files/interfaces
new file mode 100644
index 0000000..6785c87
--- /dev/null
+++ b/recipes-core/init-ifupdown/files/interfaces
@@ -0,0 +1,31 @@
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+
+# The loopback interface
+auto lo
+iface lo inet loopback
+
+# Wireless interfaces
+iface wlan0 inet dhcp
+	wireless_mode managed
+	wireless_essid any
+	wpa-driver wext
+	wpa-conf /etc/wpa_supplicant.conf
+
+iface atml0 inet dhcp
+
+# Wired or wireless interfaces including predictable names
+auto eth0
+iface eth0 inet dhcp
+iface eth1 inet dhcp
+
+# Busybox ifupdown won't process /en* correctly
+auto /en*=eth
+iface eth inet dhcp
+
+# Ethernet/RNDIS gadget (g_ether)
+# ... or on host side, usbnet and random hwaddr
+auto usb0
+iface usb0 inet dhcp
+
+# Bluetooth networking
+iface bnep0 inet dhcp
diff --git a/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend b/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
new file mode 100644
index 0000000..65e1728
--- /dev/null
+++ b/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
@@ -0,0 +1,6 @@
+#
+# Enable second network interface on startup
+#
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"