Index: contrib/conf/ia32-qe.sh
===================================================================
--- contrib/conf/ia32-qe.sh	(revision f597bc442c30ebe583db3c7ae73298e745aa081c)
+++ contrib/conf/ia32-qe.sh	(revision fa33ac4d028814f3a8e5288c28ba70f36120f69b)
@@ -1,3 +1,15 @@
 #!/bin/sh
+
+if [ -z "${QEMU_BINARY}" ] ; then
+	QEMU_BINARY="`which --tty-only qemu 2> /dev/null`"
+fi
+
+if [ -z "${QEMU_BINARY}" ] ; then
+	QEMU_BINARY="`which --tty-only qemu-system-i386 2> /dev/null`"
+fi
+
+if [ -z "${QEMU_BINARY}" ] ; then
+	echo "QEMU binary not found"
+fi
 
 DISK_IMG=hdisk.img
@@ -8,3 +20,3 @@
 fi
 
-qemu $@ -m 32 -hda "$DISK_IMG" -cdrom image.iso -boot d
+"${QEMU_BINARY}" "$@" -m 32 -hda "$DISK_IMG" -cdrom image.iso -boot d
Index: contrib/conf/net-qe.sh
===================================================================
--- contrib/conf/net-qe.sh	(revision f597bc442c30ebe583db3c7ae73298e745aa081c)
+++ contrib/conf/net-qe.sh	(revision fa33ac4d028814f3a8e5288c28ba70f36120f69b)
@@ -1,16 +1,32 @@
 #!/bin/sh
+
+if [ -z "${QEMU_BINARY}" ] ; then
+	QEMU_BINARY="`which --tty-only qemu 2> /dev/null`"
+fi
+
+if [ -z "${QEMU_BINARY}" ] ; then
+	QEMU_BINARY="`which --tty-only qemu-system-x86_64 2> /dev/null`"
+fi
+
+if [ -z "${QEMU_BINARY}" ] ; then
+	QEMU_BINARY="`which --tty-only qemu-system-i386 2> /dev/null`"
+fi
+
+if [ -z "${QEMU_BINARY}" ] ; then
+	echo "QEMU binary not found"
+fi
 
 case "$1" in
 	ne2k)
 		shift
-		qemu $@ -device ne2k_isa,irq=5,vlan=0 -net user -boot d -redir udp:8080::8080 -redir udp:8081::8081 -redir tcp:8080::8080 -redir tcp:8081::8081 -cdrom image.iso
+		"${QEMU_BINARY}" "$@" -device ne2k_isa,irq=5,vlan=0 -net user -boot d -redir udp:8080::8080 -redir udp:8081::8081 -redir tcp:8080::8080 -redir tcp:8081::8081 -cdrom image.iso
 		;;
 	e1k)
 		shift
-		qemu $@ -device e1000,vlan=0 -net user -boot d -redir udp:8080::8080 -redir udp:8081::8081 -redir tcp:8080::8080 -redir tcp:8081::8081 -cdrom image.iso
+		"${QEMU_BINARY}" "$@" -device e1000,vlan=0 -net user -boot d -redir udp:8080::8080 -redir udp:8081::8081 -redir tcp:8080::8080 -redir tcp:8081::8081 -cdrom image.iso
 		;;
 	rtl8139)
 		shift
-		qemu $@ -device rtl8139,vlan=0 -net user -boot d -redir udp:8080::8080 -redir udp:8081::8081 -redir tcp:8080::8080 -redir tcp:8081::8081 -cdrom image.iso
+		"${QEMU_BINARY}" "$@" -device rtl8139,vlan=0 -net user -boot d -redir udp:8080::8080 -redir udp:8081::8081 -redir tcp:8080::8080 -redir tcp:8081::8081 -cdrom image.iso
 		;;
 	*)