diff --git a/tools/labs/qemu/Makefile b/tools/labs/qemu/Makefile
index 7a2e97b570fa00..2a77934f11a1d4 100644
--- a/tools/labs/qemu/Makefile
+++ b/tools/labs/qemu/Makefile
@@ -1,3 +1,5 @@
+.PHONY: qemu clean
+
 QEMU_DISPLAY ?= none
 ARCH ?= x86
 ifeq ($(ARCH),x86)
@@ -32,6 +34,46 @@ QEMU_OPTS += -enable-kvm -cpu host
 ENABLE_KVM_SUDO = sudo
 endif
 
+# Run with:
+# make -j$(nproc)
+
+# Compile in skel directories with something like:
+# alias kmake='make -C "$HOME/src/linux/" M="$(pwd)"'
+# kmake
+
+# .ssh/config
+# Host osy
+#     HostName localhost
+#     Port 2222
+#     User root
+#     HostkeyAlgorithms +ssh-rsa
+#     PubkeyAcceptedAlgorithms +ssh-rsa
+
+# Mount SMB (if automount fails)
+# mount -a
+#  or if customization is needed:
+# mount -t cifs -o guest,user=guest //10.0.2.4/qemu skels
+
+# For GUI change:
+#		-append "root=/dev/vda console=ttyS0 loglevel=15 TERM=xterm" \
+#		-nographic \
+# to:
+#		-append "root=/dev/vda loglevel=15" \
+#		-display sdl \
+
+qemu: $(ZIMAGE) $(YOCTO_IMAGE)
+	qemu-system-i386 \
+		-enable-kvm -cpu host \
+		-smp 2 -m 2048 \
+		-no-reboot \
+		-nographic \
+		-drive file=$(YOCTO_IMAGE),if=virtio,format=raw \
+		-nic user,hostfwd=tcp::2222-:22,smb=$(shell readlink -f skels) \
+		-kernel $(ZIMAGE) \
+		-append "root=/dev/vda console=ttyS0 loglevel=15 TERM=xterm" \
+		-nographic \
+		-gdb tcp::1234
+
 boot: .modinst tap0 tap1 pipe1.in pipe1.out pipe2.in pipe2.out disk1.img disk2.img nttcp-run
 	$(ENABLE_KVM_SUDO) ARCH=$(ARCH) qemu/qemu.sh $(QEMU_OPTS)
 
diff --git a/tools/labs/qemu/prepare-image.sh b/tools/labs/qemu/prepare-image.sh
index 834469d189e1fb..9154dd128abcad 100755
--- a/tools/labs/qemu/prepare-image.sh
+++ b/tools/labs/qemu/prepare-image.sh
@@ -25,6 +25,14 @@ cat >> $TMP/etc/inittab <<EOF
 5:12345:respawn:/sbin/getty 38400 tty5
 EOF
 
+cat >> $TMP/etc/fstab <<EOF
+//10.0.2.4/qemu /home/root/skels cifs guest,user=guest 0 0
+EOF
+
+mkdir -p $TMP/root/skels
+
+sed -i '/^root/ s@/bin/sh@/bin/bash@' $TMP/etc/passwd
+
 # enable networking
 echo -e "auto eth0\niface eth0 inet dhcp" >> $TMP/etc/network/interfaces