diff --git a/files/usr/local/bin/olsrd-config b/files/usr/local/bin/olsrd-config
index 4f7b2ebf..be639fea 100755
--- a/files/usr/local/bin/olsrd-config
+++ b/files/usr/local/bin/olsrd-config
@@ -206,6 +206,9 @@ if validate then
                 vstate[service] = last
             elseif proto == "http" then
                 -- http so looks like a link. http check it
+                if not hostname:match("%.local%.mesh$") then
+                    hostname = hostname .. ".local.mesh"
+                end
                 local status, effective_url = io.popen("/usr/bin/curl --max-time 10 --retry 0 --connect-timeout 2 --speed-time 5 --speed-limit 1000 --silent --output /dev/null --location --write-out '%{http_code} %{url_effective}' " .. "http://" .. hostname .. ":" .. port .. path):read("*a"):match("^(%d+) (.*)")
                 if status == "200" or status == "401" then
                     vstate[service] = last
diff --git a/files/www/cgi-bin/mesh b/files/www/cgi-bin/mesh
index 0b74026a..834717bf 100755
--- a/files/www/cgi-bin/mesh
+++ b/files/www/cgi-bin/mesh
@@ -341,7 +341,7 @@ do
             if path then
                 local name, originator = name:match("(.*%S)%s*#(.*)")
                 if originator == " my own service" or (hosts[originator] and hosts[originator].name) then
-                    if not host:match("%.") then
+                    if not host:match("%.local%.mesh$") then
                         host = host .. ".local.mesh"
                     end
                     if not services[host] then
diff --git a/files/www/cgi-bin/supporttool b/files/www/cgi-bin/supporttool
index 2e2b7a04..1b09d1a1 100755
--- a/files/www/cgi-bin/supporttool
+++ b/files/www/cgi-bin/supporttool
@@ -63,6 +63,7 @@ local files = {
     "/tmp/olsrd.log",
     "/tmp/manager.log",
     "/tmp/manager.log.0",
+    "/tmp/dnsmasq.d/",
     "/tmp/AutoDistReset.log",
     "/tmp/lqm.info",
     "/tmp/wireless_monitor.info",