--- etc/csh.login
+++ etc/csh.login
@@ -64,9 +64,15 @@
 if (! ${?MAIL} ) setenv MAIL /var/spool/mail/$USER
 if (! ${?HOST} ) setenv HOST "`/bin/uname -n`"
 if (! ${?CPU}  ) setenv CPU  "`/bin/uname -m`"
-if (! ${?HOSTNAME} ) then
-    setenv HOSTNAME ${HOST}."`cat /proc/sys/kernel/domainname`"
+
+# Remark: /proc/sys/kernel/domainname and the program domainname
+# its self will provide the NIS/YP domainname, see domainname(8).
+if ( -s /etc/HOSTNAME ) then
+    if (! ${?HOSTNAME} ) setenv HOSTNAME `cat /etc/HOSTNAME`
+else
+    if (! ${?HOSTNAME} ) setenv HOSTNAME $HOST
 endif
+
 if (! ${?LOGNAME} )  set    LOGNAME=$USER
 if ( ${CPU} =~ i?86 ) then
     setenv HOSTTYPE i386
--- etc/profile
+++ etc/profile
@@ -117,9 +117,15 @@
 test -z "$MAIL" && MAIL=/var/spool/mail/$USER
 test -z "$HOST" && HOST=`/bin/uname -n 2> /dev/null`
 test -z "$CPU"  &&  CPU=`/bin/uname -m 2> /dev/null`
-if test -z "$HOSTNAME" ; then
-   HOSTNAME=${HOST}.`cat /proc/sys/kernel/domainname`
+
+# Remark: /proc/sys/kernel/domainname and the program domainname
+# its self will provide the NIS/YP domainname, see domainname(8).
+if test -s /etc/HOSTNAME ; then
+    test -z "$HOSTNAME" && HOSTNAME=`cat /etc/HOSTNAME`
+else
+    test -z "$HOSTNAME" && HOSTNAME=$HOST
 fi
+
 test -z "$LOGNAME"  && LOGNAME=$USER
 case "$CPU" in
     i?86) HOSTTYPE=i386   ;;