diff --git a/hooks/dapper/50-setup-hostname b/hooks/dapper/50-setup-hostname
index 800041b..4bb62a5 100755
--- a/hooks/dapper/50-setup-hostname
+++ b/hooks/dapper/50-setup-hostname
@@ -59,12 +59,11 @@ EOF
         #  If dhcp is diabled, FQDN should resolve to our IP
         #
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.0.1	$GUEST_HOSTNAME
-${ip1}	$GUEST_FQDN
+${ip1}	$GUEST_FQDN $GUEST_HOSTNAME
 EOF
     else
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.1.1	$GUEST_HOSTNAME $GUEST_FQDN
+127.0.1.1	$GUEST_FQDN $GUEST_HOSTNAME
 EOF
     fi
 
@@ -87,13 +86,12 @@ else
     # New entry.
     if [ -z "${dhcp}" ]; then
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.0.1	$GUEST_HOSTNAME
-${ip1}	$GUEST_FQDN
+${ip1}	$GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     else
     cat >> ${prefix}/etc/hosts <<EOF
-127.0.1.1	$GUEST_HOSTNAME $GUEST_FQDN
+127.0.1.1	$GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     fi
diff --git a/hooks/debian/50-setup-hostname b/hooks/debian/50-setup-hostname
index 800041b..4bb62a5 100755
--- a/hooks/debian/50-setup-hostname
+++ b/hooks/debian/50-setup-hostname
@@ -59,12 +59,11 @@ EOF
         #  If dhcp is diabled, FQDN should resolve to our IP
         #
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.0.1	$GUEST_HOSTNAME
-${ip1}	$GUEST_FQDN
+${ip1}	$GUEST_FQDN $GUEST_HOSTNAME
 EOF
     else
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.1.1	$GUEST_HOSTNAME $GUEST_FQDN
+127.0.1.1	$GUEST_FQDN $GUEST_HOSTNAME
 EOF
     fi
 
@@ -87,13 +86,12 @@ else
     # New entry.
     if [ -z "${dhcp}" ]; then
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.0.1	$GUEST_HOSTNAME
-${ip1}	$GUEST_FQDN
+${ip1}	$GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     else
     cat >> ${prefix}/etc/hosts <<EOF
-127.0.1.1	$GUEST_HOSTNAME $GUEST_FQDN
+127.0.1.1	$GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     fi
diff --git a/hooks/edgy/50-setup-hostname b/hooks/edgy/50-setup-hostname
index 800041b..4bb62a5 100755
--- a/hooks/edgy/50-setup-hostname
+++ b/hooks/edgy/50-setup-hostname
@@ -59,12 +59,11 @@ EOF
         #  If dhcp is diabled, FQDN should resolve to our IP
         #
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.0.1	$GUEST_HOSTNAME
-${ip1}	$GUEST_FQDN
+${ip1}	$GUEST_FQDN $GUEST_HOSTNAME
 EOF
     else
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.1.1	$GUEST_HOSTNAME $GUEST_FQDN
+127.0.1.1	$GUEST_FQDN $GUEST_HOSTNAME
 EOF
     fi
 
@@ -87,13 +86,12 @@ else
     # New entry.
     if [ -z "${dhcp}" ]; then
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.0.1	$GUEST_HOSTNAME
-${ip1}	$GUEST_FQDN
+${ip1}	$GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     else
     cat >> ${prefix}/etc/hosts <<EOF
-127.0.1.1	$GUEST_HOSTNAME $GUEST_FQDN
+127.0.1.1	$GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     fi
diff --git a/hooks/intrepid/50-setup-hostname b/hooks/intrepid/50-setup-hostname
index 800041b..4bb62a5 100755
--- a/hooks/intrepid/50-setup-hostname
+++ b/hooks/intrepid/50-setup-hostname
@@ -59,12 +59,11 @@ EOF
         #  If dhcp is diabled, FQDN should resolve to our IP
         #
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.0.1	$GUEST_HOSTNAME
-${ip1}	$GUEST_FQDN
+${ip1}	$GUEST_FQDN $GUEST_HOSTNAME
 EOF
     else
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.1.1	$GUEST_HOSTNAME $GUEST_FQDN
+127.0.1.1	$GUEST_FQDN $GUEST_HOSTNAME
 EOF
     fi
 
@@ -87,13 +86,12 @@ else
     # New entry.
     if [ -z "${dhcp}" ]; then
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.0.1	$GUEST_HOSTNAME
-${ip1}	$GUEST_FQDN
+${ip1}	$GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     else
     cat >> ${prefix}/etc/hosts <<EOF
-127.0.1.1	$GUEST_HOSTNAME $GUEST_FQDN
+127.0.1.1	$GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     fi
diff --git a/hooks/karmic/50-setup-hostname b/hooks/karmic/50-setup-hostname
index 800041b..4bb62a5 100755
--- a/hooks/karmic/50-setup-hostname
+++ b/hooks/karmic/50-setup-hostname
@@ -59,12 +59,11 @@ EOF
         #  If dhcp is diabled, FQDN should resolve to our IP
         #
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.0.1	$GUEST_HOSTNAME
-${ip1}	$GUEST_FQDN
+${ip1}	$GUEST_FQDN $GUEST_HOSTNAME
 EOF
     else
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.1.1	$GUEST_HOSTNAME $GUEST_FQDN
+127.0.1.1	$GUEST_FQDN $GUEST_HOSTNAME
 EOF
     fi
 
@@ -87,13 +86,12 @@ else
     # New entry.
     if [ -z "${dhcp}" ]; then
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.0.1	$GUEST_HOSTNAME
-${ip1}	$GUEST_FQDN
+${ip1}	$GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     else
     cat >> ${prefix}/etc/hosts <<EOF
-127.0.1.1	$GUEST_HOSTNAME $GUEST_FQDN
+127.0.1.1	$GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     fi