diff --git a/plugins/00_dokku-standard/install b/plugins/00_dokku-standard/install
index f1b46c436..c7a2913a8 100755
--- a/plugins/00_dokku-standard/install
+++ b/plugins/00_dokku-standard/install
@@ -3,7 +3,7 @@ set -eo pipefail
 
 sed -i 's/docker -d$/docker -d -r=true/' /etc/init/docker.conf
 
-echo $HOSTNAME > $DOKKU_ROOT/HOSTNAME
+echo $(hostname -f) > $DOKKU_ROOT/HOSTNAME
 
 
 # temporary hack for https://github.com/progrium/dokku/issues/82
diff --git a/plugins/nginx-vhosts/install b/plugins/nginx-vhosts/install
index 447f39894..c919b2d2e 100755
--- a/plugins/nginx-vhosts/install
+++ b/plugins/nginx-vhosts/install
@@ -18,6 +18,6 @@ echo "include $DOKKU_ROOT/*/nginx.conf;" > /etc/nginx/conf.d/dokku.conf
 
 sed -i 's/# server_names_hash_bucket_size/server_names_hash_bucket_size/' /etc/nginx/nginx.conf
 
-[[ $(dig +short $HOSTNAME) ]] && echo $HOSTNAME > $DOKKU_ROOT/VHOST
+[[ $(dig +short $(< "$DOKKU_ROOT/HOSTNAME")) ]] && cp "$DOKKU_ROOT/HOSTNAME" "$DOKKU_ROOT/VHOST"
 
 /etc/init.d/nginx start