diff --git a/client/vglconnect.in b/client/vglconnect.in
index ae93ee8a..f3d3e125 100644
--- a/client/vglconnect.in
+++ b/client/vglconnect.in
@@ -177,5 +177,5 @@ EOF
 	fi
 else
 	DNUM=`echo $DISPLAY | sed 's/.*[:]//g'`
-	xauth add `hostname`":"$DNUM . $XAUTHCOOKIE
+	xauth add `uname -n`":"$DNUM . $XAUTHCOOKIE
 fi
diff --git a/server/vglrun.in b/server/vglrun.in
index 82fbf184..191f4544 100644
--- a/server/vglrun.in
+++ b/server/vglrun.in
@@ -190,7 +190,7 @@ if [ -z "$DISPLAY" ]; then
 	fi
 else
 	DISPLAYHOST=`echo $DISPLAY | cut -d: -f1`
-	if [ "$DISPLAYHOST" = "localhost" -o "$DISPLAYHOST" = "`hostname`" ]; then
+	if [ "$DISPLAYHOST" = "localhost" -o "$DISPLAYHOST" = "`uname -n`" ]; then
 		if [ ! -z "$SSH_IP" -a -z "$VGL_CLIENT" -a -z "$RRCLIENT" ]; then
 			VGL_CLIENT=$SSH_IP
 			export VGL_CLIENT