diff --git a/install_amavis.sh b/install_amavis.sh
index 29076ad..cfb3efa 100755
--- a/install_amavis.sh
+++ b/install_amavis.sh
@@ -198,13 +198,6 @@ fi
 # --- Some further default values depending on Hostname
 # -------------
 
-if [[ -z "$_HOSTNAME" ]] ; then
-   _HOSTNAME="$(hostname -f)"
-   _HOSTNAME_SHORT="$(hostname)"
-   [[ "$_HOSTNAME" = "$_HOSTNAME_SHORT" ]] && _HOSTNAME=""
-fi
-
-
 # - Set default values for ipv4- and ipv6-address
 # -
 if [[ -z $_IPV4 ]] && [[ -n "$_HOSTNAME" ]] && [[ -x "$(which dig)" ]]; then