diff --git a/xCAT/postscripts/syslog b/xCAT/postscripts/syslog
index 91a3bd040..162fda89d 100755
--- a/xCAT/postscripts/syslog
+++ b/xCAT/postscripts/syslog
@@ -262,6 +262,12 @@ else
       echo "# xCAT settings" >> $conf_file
       echo "destination loghost { udp(\"$master\"); };" >> $conf_file
       echo 'log { source(src); destination(loghost); };' >> $conf_file
+ 
+      # remove the settings that will log to local files
+      sed -i '/destination messages/s/^/#/'  $conf_file
+      sed -i '/destination(messages)/s/^/#/'  $conf_file
+      sed -i '/destination warn/s/^/#/'  $conf_file
+      sed -i '/destination(warn)/s/^/#/'  $conf_file
     else 
       if [ -f $conf_file.XCATORIG ]; then 
         rm -f $conf_file