diff --git a/ChangeLog b/ChangeLog
index bc1d3a1..64548af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,8 @@ Version NEXT
 	  fsetup: No host given! instead of fhost:
 	fsetupcmd got -l option. It lists all known fsp servers collected
 	  from .fspsites files.
+	fpwd command from setup.sh now prints site name instead of ip
+	  address if possible.
 
 Version 2.8.1b25 - 10 Sep 2009
 	GNU autotools build system was entirely replaced by SCons
diff --git a/setup.sh b/setup.sh
index 5cc9107..e61e84c 100644
--- a/setup.sh
+++ b/setup.sh
@@ -42,7 +42,13 @@ _fmore()  { fcatcmd   "$@" | more ; set +f;}
 alias fmore='set -f;_fmore'
 _fpro()   { fprocmd   "$@"; set +f;}
 alias fpro='set -f;_fpro'
-fpwd()   { echo $FSP_DIR on $FSP_HOST port $FSP_PORT ;}
+fpwd()    { 
+            if [ ! -z $FSP_NAME ]; then
+		host=$FSP_NAME;
+	    else
+		host=$FSP_HOST;
+	    fi		
+            echo $FSP_DIR on $host port $FSP_PORT ;}
 _frm()    { frmcmd    "$@"; set +f ;}
 alias frm='set -f;_frm'
 _frmdir() { frmdircmd "$@"; set +f ;}