diff --git a/files/www/cgi-bin/mesh b/files/www/cgi-bin/mesh
index 4d3a1093..0d820ec9 100755
--- a/files/www/cgi-bin/mesh
+++ b/files/www/cgi-bin/mesh
@@ -118,6 +118,10 @@ foreach(`cat /etc/hosts`)
     }
     else
     {
+	if ( $name !~ /\./ )
+        {
+          $name="${name}.local.mesh";
+        }
 	push @{$localhosts{$my_ip}{hosts}}, $name;
     }
 }
@@ -153,6 +157,10 @@ foreach(`cat /var/run/hosts_olsr 2>/dev/null`)
     }
     else
     {
+	if ( $name !~ /\./ )
+        {
+          $name="${name}.local.mesh";
+        }
 	push @{$hosts{$originator}{hosts}}, $name;
     }
 }