diff --git a/src/freedombone b/src/freedombone
index b0578873..cec31ddb 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -1216,6 +1216,33 @@ function read_configuration {
     fi
 }
 
+function set_default_onion_domains {
+    # If sites are only visible via Tor then for installation
+    # purposes assign them some default domain names
+    if [[ $ONION_ONLY == "no" ]]; then
+        return
+    fi
+
+    if [ $OWNCLOUD_DOMAIN_NAME ]; then
+        OWNCLOUD_DOMAIN_NAME='owncloud.onion'
+    fi
+    if [ $MICROBLOG_DOMAIN_NAME ]; then
+        MICROBLOG_DOMAIN_NAME='microblog.onion'
+    fi
+    if [ $FULLBLOG_DOMAIN_NAME ]; then
+        FULLBLOG_DOMAIN_NAME='blog.onion'
+    fi
+    if [ $GIT_DOMAIN_NAME ]; then
+        GIT_DOMAIN_NAME='git.onion'
+    fi
+    if [ $WIKI_DOMAIN_NAME ]; then
+        WIKI_DOMAIN_NAME='wiki.onion'
+    fi
+    if [ $DEFAULT_DOMAIN_NAME ]; then
+        DEFAULT_DOMAIN_NAME="${PROJECT_NAME}.onion"
+    fi
+}
+
 # check an individual domain name
 function test_domain_name {
     if [ $1 ]; then
@@ -2939,6 +2966,10 @@ function get_mariadb_owncloud_admin_password {
 }
 
 function create_freedns_updater {
+    if [[ $ONION_ONLY != "no" ]]; then
+        return
+    fi
+
     # currently inadyn doesn't work as expected with freeDNS, so this is a workaround
     if grep -Fxq "create_freedns_updater" $COMPLETION_FILE; then
         return
@@ -5628,6 +5659,9 @@ function install_owncloud_music_app {
 }
 
 function add_ddns_domain {
+    if [[ $ONION_ONLY != "no" ]]; then
+        return
+    fi
     if [ ! $CURRENT_DDNS_DOMAIN ]; then
         echo $'ddns domain not specified'
         exit 5638
@@ -8864,6 +8898,9 @@ function install_dynamicdns {
     if [[ $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
         return
     fi
+    if [[ $ONION_ONLY != "no" ]]; then
+        return
+    fi
 
     # update to the next commit
     if [ -d $INSTALL_DIR/inadyn ]; then
@@ -9340,6 +9377,7 @@ function install_final {
 
 
 read_configuration
+set_default_onion_domains
 locale_setup
 parse_args
 check_domains