diff --git a/INSTALL.txt b/INSTALL.txt
index 753c7b50c3..755f3b71ac 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -6,6 +6,8 @@ Minimal tools needed (for CentOS7)
 
 The minimal RPMs (as provided by CentOS7 yum) needed to build this package are:
 autoconf automake make libtool libtool-ltdl libtool-ltdl-devel gcc gcc-c++ patch openssl openssl-devel
+The minimal DEBs (as provided by Ubuntu 18.04) are
+autoconf automake make libtool libltdl-dev gcc g++ patch openssl libssl-dev pkg-config
 
 If not already installed, please also add
  curl
diff --git a/common/source/scripts/globus-hostname.in b/common/source/scripts/globus-hostname.in
index 6cdfea6d01..86a9f77096 100644
--- a/common/source/scripts/globus-hostname.in
+++ b/common/source/scripts/globus-hostname.in
@@ -137,7 +137,11 @@ if [ -z "${GLOBUS_HOSTNAME}" ] ; then
   GLOBUS_HOSTNAME="`echo ${_fullname} | tr 'A-Z' 'a-z'`"
 fi
 
-GLOBUS_DOMAINNAME="`echo $GLOBUS_HOSTNAME | cut -s -d '.' -f '2-'`"
+if $(echo "$GLOBUS_HOSTNAME" | grep -Eq '^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$'); then
+	GLOBUS_DOMAINNAME=""
+else
+	GLOBUS_DOMAINNAME="`echo $GLOBUS_HOSTNAME | cut -s -d '.' -f '2-'`"
+fi
 
 case "${PROGRAM_NAME}" in
 
@@ -152,4 +156,3 @@ esac
 
 
 
-