diff --git a/scripts_debian/04_install_qubes.sh b/scripts_debian/04_install_qubes.sh
index c5067b4..47530d4 100755
--- a/scripts_debian/04_install_qubes.sh
+++ b/scripts_debian/04_install_qubes.sh
@@ -188,6 +188,13 @@ EOF
     # - font fixes for display issues 
     # --------------------------------------------------------------------------
     copyTree "qubes-files" "${SCRIPTSDIR}" "${INSTALLDIR}"
+
+    # --------------------------------------------------------------------------
+    # Looks like hosts file may contain tabs and qubes will not parse it 
+    # correctly
+    # --------------------------------------------------------------------------
+    expand "${INSTALLDIR}/etc/hosts" > "${INSATLLDIR}/etc/hosts.dist"
+    mv "${INSTALLDIR}/etc/hosts.dist" "${INSATLLDIR}/etc/hosts"
 fi
 
 # ------------------------------------------------------------------------------