diff --git a/makerpm b/makerpm
index 14a4d7c02..76a800688 100755
--- a/makerpm
+++ b/makerpm
@@ -100,6 +100,7 @@ function makexcat {
 			tar --exclude .svn -czf $RPMROOT/SOURCES/prescripts.tar.gz  prescripts
 			tar --exclude .svn -czf $RPMROOT/SOURCES/templates.tar.gz templates
 			tar --exclude .svn -czf $RPMROOT/SOURCES/winpostscripts.tar.gz winpostscripts
+			tar --exclude .svn -czf $RPMROOT/SOURCES/etc.tar.gz etc
 			cp xcat.conf $RPMROOT/SOURCES
 			cp xcat.conf.apach24 $RPMROOT/SOURCES
 			cp xCATMN $RPMROOT/SOURCES
diff --git a/xCAT/debian/dirs b/xCAT/debian/dirs
index f1b529689..5a175ee43 100644
--- a/xCAT/debian/dirs
+++ b/xCAT/debian/dirs
@@ -7,4 +7,6 @@ opt/xcat/share/xcat
 etc/apache2/conf.d
 etc/apache2/conf-available
 etc/apache2/conf-enabled
+etc/logrotate.d
+etc/rsyslog.d
 opt/xcat/share/doc/packages/xCAT
diff --git a/xCAT/debian/install b/xCAT/debian/install
index 33798984d..ef7f7dd4d 100644
--- a/xCAT/debian/install
+++ b/xCAT/debian/install
@@ -6,3 +6,5 @@ postscripts/* install/postscripts/
 prescripts/* install/prescripts/
 templates/* opt/xcat/share/xcat/templates/
 xCATMN etc/
+etc/logrotate.d/* etc/logrotate.d/
+etc/rsyslog.d/* etc/rsyslog.d/
diff --git a/xCAT/debian/postinst b/xCAT/debian/postinst
index 509d48446..8165446f4 100644
--- a/xCAT/debian/postinst
+++ b/xCAT/debian/postinst
@@ -45,6 +45,8 @@ case "$1" in
          ln -s -f /etc/apache2/conf-available/xcat.conf.apach24 /etc/apache2/conf-enabled/xcat.conf
 
 	/etc/init.d/apache2 restart
+
+	kill -HUP $(</var/run/rsyslogd.pid) >/dev/null 2>&1 || :
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
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..3a0d6712d
--- /dev/null
+++ b/xCAT/etc/rsyslog.d/xcat-cluster.conf
@@ -0,0 +1,2 @@
+$template xCATTraditionalFormat0,"%timegenerated% %HOSTNAME% %syslogtag% %msg:::drop-last-lf%\n"
+:programname, 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..527360171
--- /dev/null
+++ b/xCAT/etc/rsyslog.d/xcat-compute.conf
@@ -0,0 +1,2 @@
+$template xCATTraditionalFormat9,"%timegenerated% %HOSTNAME% %syslogtag% %msg:::drop-last-lf%\n"
+:fromhost-ip, !isequal, "127.0.0.1" /var/log/xcat/computes.log;xCATTraditionalFormat9
diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec
index 54bea22d2..4ebbb4033 100644
--- a/xCAT/xCAT.spec
+++ b/xCAT/xCAT.spec
@@ -18,6 +18,7 @@ Source5: xCATMN
 %ifos linux
 Source4: prescripts.tar.gz
 Source6: winpostscripts.tar.gz
+Source8: etc.tar.gz
 %endif
 
 Source7: xcat.conf.apach24
@@ -86,6 +87,7 @@ hardware management and software management.
 tar zxf %{SOURCE2}
 tar zxf %{SOURCE4}
 tar zxf %{SOURCE6}
+tar zxf %{SOURCE8}
 %else
 rm -rf postscripts
 cp %{SOURCE2} /opt/freeware/src/packages/BUILD
@@ -125,6 +127,8 @@ fi
 mkdir -p $RPM_BUILD_ROOT/etc/xcat/conf.orig
 mkdir -p $RPM_BUILD_ROOT/etc/apache2/conf.d
 mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d
+mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
+mkdir -p $RPM_BUILD_ROOT/etc/rsyslog.d
 mkdir -p $RPM_BUILD_ROOT/install/postscripts
 mkdir -p $RPM_BUILD_ROOT/install/prescripts
 mkdir -p $RPM_BUILD_ROOT/install/kdump
@@ -140,6 +144,13 @@ tar -xf templates.tar
 rm templates.tar
 %endif
 
+cd -
+cd $RPM_BUILD_ROOT
+
+%ifos linux
+tar zxf %{SOURCE8}
+%endif
+
 cd -
 cd $RPM_BUILD_ROOT/install
 
@@ -190,6 +201,8 @@ then
    cp /etc/xcat/conf.orig/xcat.conf.apach24 /etc/apache2/conf.d/xcat.conf
 fi
 
+# Lets rsyslogd perform close all open files
+kill -HUP $(</var/run/rsyslogd.pid) >/dev/null 2>&1 || :
 %endif
 
 # create dir for the current pid
@@ -232,6 +245,9 @@ exit 0
 /install/postscripts
 /install/prescripts
 %ifos linux
+/etc/logrotate.d/xcat
+/etc/rsyslog.d/xcat-cluster.conf
+/etc/rsyslog.d/xcat-compute.conf
 /install/winpostscripts
 %endif
 %defattr(-,root,root)