diff --git a/libguestfs.changes b/libguestfs.changes
index 77a53d7..a7bb74a 100644
--- a/libguestfs.changes
+++ b/libguestfs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jan 23 17:53:31 CET 2014 - ohering@suse.de
+
+- Disable ipv6 in the appliance because qemu usernet is ipv4 only
+
 -------------------------------------------------------------------
 Wed Jan 22 10:13:00 UTC 2014 - ohering@suse.com
 
diff --git a/libguestfs.mkinitrd.boot.sh b/libguestfs.mkinitrd.boot.sh
index 0924142..2362b95 100644
--- a/libguestfs.mkinitrd.boot.sh
+++ b/libguestfs.mkinitrd.boot.sh
@@ -81,7 +81,6 @@
 #%udevmodules: nfsv2
 #%udevmodules: nfsv3
 #%udevmodules: nfsv4
-#%udevmodules: ipv6
 #
 #%udevmodules: dm-crypt
 #
@@ -237,6 +236,16 @@ for f in /sys/block/sd*/device/timeout; do if test -w $f ; then echo 300 > $f; f
 # https://access.redhat.com/site/solutions/5427
 for f in /sys/block/{h,s,ub,v}d*/queue/scheduler; do if test -w $f ; then echo noop > $f; fi; done
 
+# Disable ipv6 because host names resolve to ipv4 and ipv6
+# Resolver may prefer ipv6 and qemu usernet does only ipv4
+for f in /proc/sys/net/ipv6/conf/*/disable_ipv6
+do
+	if test -w $f
+	then
+		echo 1 > $f
+	fi
+done
+
 # Set up the network.
 ip addr add 127.0.0.1/8 brd + dev lo scope host
 ip link set dev lo up
diff --git a/libguestfs.mkinitrd.setup.sh b/libguestfs.mkinitrd.setup.sh
index 6a43584..39917c9 100644
--- a/libguestfs.mkinitrd.setup.sh
+++ b/libguestfs.mkinitrd.setup.sh
@@ -11,6 +11,10 @@ do
 	cp $i $tmp_mnt$i
 done
 
+# Disable ipv6 because host names resolve to ipv4 and ipv6
+# Resolver may prefer ipv6 and qemu usernet does only ipv4
+echo install ipv6 /bin/true >> $tmp_mnt/etc/modprobe.conf.local
+
 # many guestfish commands need a mount point
 # in guestfsd the mount point defaults to /sysroot
 mkdir -vp $tmp_mnt/sysroot