diff --git a/vm-init.d/qubes_core b/vm-init.d/qubes_core
index c3accd9..52bb1cd 100755
--- a/vm-init.d/qubes_core
+++ b/vm-init.d/qubes_core
@@ -26,7 +26,7 @@ start()
 		# because it makes some of the pre-created dotfiles invalid (e.g. .kde/cache-<hostname>)
 		# (let's be frank: nobody's gonna use xterm on DispVM)
 		hostname $name
-		(grep -v "\<$name\>" /etc/hosts; echo "127.0.0.1 $name") > /etc/hosts
+		(grep -v "\<$name\>" /etc/hosts; echo "127.0.0.1 $name localhost") > /etc/hosts
 	fi
 
 	timezone=`/usr/bin/xenstore-read qubes-timezone 2> /dev/null`
diff --git a/vm-systemd/qubes-sysinit.sh b/vm-systemd/qubes-sysinit.sh
index 65c3606..9e3c488 100755
--- a/vm-systemd/qubes-sysinit.sh
+++ b/vm-systemd/qubes-sysinit.sh
@@ -52,7 +52,7 @@ done
 name=`$XS_READ name`
 if [ -n "$name" ]; then
     hostname $name
-    (grep -v "\<$name\>" /etc/hosts; echo "127.0.0.1 $name") > /etc/hosts
+    (grep -v "\<$name\>" /etc/hosts; echo "127.0.0.1 $name localhost") > /etc/hosts
 fi
 
 timezone=`$XS_READ qubes-timezone 2> /dev/null`