diff --git a/twander.py b/twander.py
index d2eaa80..8fb0f38 100755
--- a/twander.py
+++ b/twander.py
@@ -6,7 +6,7 @@
 # Program Information
 
 PROGNAME = "twander"
-RCSID = "$Id: twander.py,v 2.92 2003/02/07 00:21:42 tundra Exp $"
+RCSID = "$Id: twander.py,v 2.93 2003/02/10 17:39:47 tundra Exp $"
 VERSION = RCSID.split()[2]
 
 # Copyright Information
@@ -302,7 +302,13 @@
 
 # Get hostname
 
-HOSTNAME      = getfqdn()       # Full name of this host
+# Try the local environment first when looking for the
+# hostname.  Only use the socket call as a last
+# resort because a misconfigured or malfunctioning
+# network will cause this call to be *very* slow
+# and 'twander' will take forever to start-up.
+
+HOSTNAME = os.getenv("HOSTNAME") or getfqdn()
 
 # Get the user name