diff --git a/xCAT/etc/logrotate.d/xcat b/xCAT/etc/logrotate.d/xcat
new file mode 100644
index 000000000..65d65abfb
--- /dev/null
+++ b/xCAT/etc/logrotate.d/xcat
@@ -0,0 +1,7 @@
+/var/log/xcat/*.log {
+    missingok
+    sharedscripts
+    postrotate
+        /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
+    endscript
+}
diff --git a/xCAT/etc/rsyslog.d/xcat-cluster.conf b/xCAT/etc/rsyslog.d/xcat-cluster.conf
new file mode 100644
index 000000000..bda027146
--- /dev/null
+++ b/xCAT/etc/rsyslog.d/xcat-cluster.conf
@@ -0,0 +1,2 @@
+$template xCATTraditionalFormat0,"%timegenerated% %HOSTNAME% %syslogtag% %msg:::drop-last-lf%\n"
+:syslogtag, isequal, "xcat" /var/log/xcat/cluster.log;xCATTraditionalFormat0
diff --git a/xCAT/etc/rsyslog.d/xcat-compute.conf b/xCAT/etc/rsyslog.d/xcat-compute.conf
new file mode 100644
index 000000000..23ee24fd3
--- /dev/null
+++ b/xCAT/etc/rsyslog.d/xcat-compute.conf
@@ -0,0 +1,2 @@
+$template xCATTraditionalFormat9,"%timegenerated% %HOSTNAME% %syslogtag% %msg:::drop-last-lf%\n"
+:hostname, [!]isequal, $myhostname /var/log/xcat/computes.log;xCATTraditionalFormat9