diff --git a/setup.csh b/setup.csh
index 999258d7b8e610b31b657f6851ffa4e03c7abe8e..6a543dca881f5e6585c0f9eefd20873608a1826d 100644
--- a/setup.csh
+++ b/setup.csh
@@ -1,11 +1,13 @@
-#!/bin/tcsh
+#!/bin/csh
 
-if ( $?loginsh ) then
+if ( -r "./setup.csh" ) then
   set MYDIR=`pwd`
-  echo "--> Setting HCANALYZER to $MYDIR"
+  if ($?prompt) then
+    echo "--> Setting HCANALYZER to '$MYDIR'"
+  endif
 else
   if ( "$1" == "" ) then
-    echo "ERROR:  'setup.csh' must have a path to the hcana location as its argument"
+    echo "ERROR:  'setup.csh' should have a path to the hcana location as its argument."
     echo "   Often this is also the location of the setup.csh script itself:"
     echo "     source /my/path/to/setup.csh /my/path/to/setup.csh"
     echo "   Or, if you have already cd'd into the hcana directory, then you can call:"