diff --git a/src/freedombone-config b/src/freedombone-config
index 33cf07ee..c26b8391 100755
--- a/src/freedombone-config
+++ b/src/freedombone-config
@@ -244,7 +244,7 @@ function choose_default_domain_name {
     fi
 
     if [[ $ONION_ONLY != "no" ]]; then
-        DEFAULT_DOMAIN_NAME="${PROJECT_NAME}.local"
+        DEFAULT_DOMAIN_NAME="${LOCAL_NAME}.local"
     else
         DEFAULT_DOMAIN_DETAILS_COMPLETE=
         while [ ! $DEFAULT_DOMAIN_DETAILS_COMPLETE ]
diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index 905cce06..d4db62d3 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -49,6 +49,8 @@ function please_wait {
 
 please_wait
 
+source /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-vars
+
 UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
 for f in $UTILS_FILES
 do
@@ -410,7 +412,7 @@ function show_domains {
                 icann_address='-'
             fi
             if [[ $ONION_ONLY != 'no' ]]; then
-                if [[ ${icann_address} != ${PROJECT_NAME}.local ]]; then
+                if [[ ${icann_address} != ${LOCAL_NAME}.local ]]; then
                     icann_address='-'
                 fi
             fi
diff --git a/src/freedombone-image b/src/freedombone-image
index 4c22e5cb..7b4b9b87 100755
--- a/src/freedombone-image
+++ b/src/freedombone-image
@@ -93,7 +93,7 @@ NAMESERVER6='4.4.4.4'
 # An optional freedombone configuration file
 CONFIG_FILENAME=
 
-DEFAULT_DOMAIN_NAME="${PROJECT_NAME}.local"
+DEFAULT_DOMAIN_NAME="${LOCAL_NAME}.local"
 
 # Minimum number of characters in a password
 MINIMUM_PASSWORD_LENGTH=$(cat /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-passwords | grep 'MINIMUM_PASSWORD_LENGTH=' | head -n 1 | awk -F '=' '{print $2}')
diff --git a/src/freedombone-utils-config b/src/freedombone-utils-config
index cd4e8742..06247c9c 100755
--- a/src/freedombone-utils-config
+++ b/src/freedombone-utils-config
@@ -351,7 +351,7 @@ function check_domains {
         domain_param=$(echo "$d" | awk -F '=' '{print $1}')
         if [[ "$domain_param" != "DEFAULT_DOMAIN_NAME" ]]; then
             domain_value=$(echo "$d" | awk -F '=' '{print $2}')
-            if [[ "$domain_value" != "${PROJECT_NAME}.local" ]]; then
+            if [[ "$domain_value" != "${LOCAL_NAME}.local" ]]; then
                 item_in_array "${domain_value}" "${checked_domains[@]}"
                 if [[ $? != 0 ]]; then
                     # test that this is a valid domain name
diff --git a/src/freedombone-utils-onion b/src/freedombone-utils-onion
index 112ae85d..7f91d64a 100755
--- a/src/freedombone-utils-onion
+++ b/src/freedombone-utils-onion
@@ -161,7 +161,7 @@ function set_default_onion_domains {
     HTMLY_DOMAIN_NAME='htmly.local'
     GHOST_DOMAIN_NAME='ghost.local'
     DOKUWIKI_DOMAIN_NAME='dokuwiki.local'
-    DEFAULT_DOMAIN_NAME="${PROJECT_NAME}.local"
+    DEFAULT_DOMAIN_NAME="${LOCAL_NAME}.local"
     GIT_DOMAIN_NAME='gogs.local'
 }
 
diff --git a/src/freedombone-utils-setup b/src/freedombone-utils-setup
index 6e65cde7..9ace64d8 100755
--- a/src/freedombone-utils-setup
+++ b/src/freedombone-utils-setup
@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-2017 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -32,6 +32,10 @@ if [ ! $PROJECT_NAME ]; then
     PROJECT_NAME='freedombone'
 fi
 
+if [ ! $LOCAL_NAME ]; then
+    LOCAL_NAME=${PROJECT_NAME}
+fi
+
 DEFAULT_DOMAIN_NAME=
 DEFAULT_DOMAIN_CODE=
 MY_USERNAME=
diff --git a/src/freedombone-vars b/src/freedombone-vars
index a4c5c04b..c35fa00a 100755
--- a/src/freedombone-vars
+++ b/src/freedombone-vars
@@ -107,4 +107,7 @@ MY_NAME=$DEFAULT_DOMAIN_NAME
 # used to select mesh install functions when creating a mesh image
 INSTALLING_MESH=
 
+# The .local avahi name
+LOCAL_NAME=${PROJECT_NAME}
+
 # NOTE: deliberately there is no "exit 0"