diff --git a/xCAT/postscripts/remoteshell b/xCAT/postscripts/remoteshell
index 3bb02ffdf..ec08cce70 100755
--- a/xCAT/postscripts/remoteshell
+++ b/xCAT/postscripts/remoteshell
@@ -2,6 +2,11 @@
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 #(C)IBM Corp
 #
+# if on the Management Node, exit
+if [ -e /etc/xCATMN ]; then
+	logger -t xcat -p local4.info "Running on the Management Node ,  exiting "
+   exit 0
+fi
 #  Linux or if AIX call aixremoteshell -d 
 if [ "$(uname -s)" = "AIX" ]; then
    ./aixremoteshell -d 2>&1