2 files changed, 3 insertions, 2 deletions
diff --git a/bin/awd b/bin/awd
index 584b1051..eed97fe1 100755
--- a/bin/awd
+++ b/bin/awd
@@ -14,7 +14,8 @@ case $# in
 	sys=$1
 	;;
 0)
-	sys=`hostname -s`
+	# hostname -s sets the hostname to "-s" on Solaris
+	sys=`hostname |sed 's/\..*//'`
 	;;
 *)
 	usage
diff --git a/bin/g b/bin/g
index 33460f8b..b71bb31e 100755
--- a/bin/g
+++ b/bin/g
@@ -31,7 +31,7 @@ case $# in
 1)
 	pattern="$1"
 	files=`/bin/ls *.[bcChlmy] *.cc *.lx *.py *.tex *.ms *.java *.xy 2>/dev/null |
-		9 grep -v '\.tabx?\.[ch]$'`
+		9 grep -v '\.tabx?\.[ch]$|^[xyz]\.'`
 	;;
 *)
 	pattern="$1"