diff --git a/perl-xCAT/xCAT/data/discinfo.pm b/perl-xCAT/xCAT/data/discinfo.pm
index 36d76a554..f7093026a 100755
--- a/perl-xCAT/xCAT/data/discinfo.pm
+++ b/perl-xCAT/xCAT/data/discinfo.pm
@@ -82,7 +82,7 @@ require Exporter;
                  "1305315870.828212" => "fedora15", #x86_64 DVD ISO
                  "1372355769.065812" => "fedora19", #x86_64 DVD ISO
                  "1372402928.663653" => "fedora19", #ppc64 DVD ISO
-
+                 "1386856788.124593" => "fedora20", #x86_64 DVD ISO
                  "1194512200.047708" => "rhas4.6",
                  "1194512327.501046" => "rhas4.6",
                  "1241464993.830723" => "rhas4.8", #x86-64
diff --git a/xCAT-server/share/xcat/install/fedora/compute.fedora19.pkglist b/xCAT-server/share/xcat/install/fedora/compute.fedora19.pkglist
index 95f7e9963..2a8ba4e17 100644
--- a/xCAT-server/share/xcat/install/fedora/compute.fedora19.pkglist
+++ b/xCAT-server/share/xcat/install/fedora/compute.fedora19.pkglist
@@ -8,3 +8,4 @@ rsync
 net-tools
 openssh-server
 util-linux-ng
+rsyslog
diff --git a/xCAT-server/share/xcat/install/fedora/compute.fedora20.pkglist b/xCAT-server/share/xcat/install/fedora/compute.fedora20.pkglist
new file mode 100644
index 000000000..2a8ba4e17
--- /dev/null
+++ b/xCAT-server/share/xcat/install/fedora/compute.fedora20.pkglist
@@ -0,0 +1,11 @@
+#Please make sure there is a space between @ and group name
+yp-tools
+wget
+vim-minimal
+ntpdate
+nfs-utils
+rsync
+net-tools
+openssh-server
+util-linux-ng
+rsyslog
diff --git a/xCAT-server/share/xcat/install/fedora/compute.fedora20.tmpl b/xCAT-server/share/xcat/install/fedora/compute.fedora20.tmpl
new file mode 100644
index 000000000..c7dbef826
--- /dev/null
+++ b/xCAT-server/share/xcat/install/fedora/compute.fedora20.tmpl
@@ -0,0 +1,156 @@
+#egan@us.ibm.com
+#
+#cmdline
+
+lang en_US
+
+#
+# Where's the source?
+# nfs --server hostname.of.server or IP --dir /path/to/RH/CD/image
+#
+#nfs --server #XCATVAR:INSTALL_NFS# --dir #XCATVAR:INSTALL_SRC_DIR#
+
+%include /tmp/repos
+
+#device ethernet e100
+keyboard "us"
+
+#
+# Clear the MBR
+#
+zerombr
+
+#
+# Wipe out the disk
+#
+clearpart --all --initlabel
+#clearpart --linux
+#key --skip
+
+#
+# Customize to fit your needs
+#
+
+#XCAT_PARTITION_START#
+#No RAID
+#/boot really significant for this sort of setup nowadays?
+#part /boot --size 50 --fstype ext3
+%include /tmp/partitioning
+#XCAT_PARTITION_END#
+
+#RAID 0 /scr for performance
+#part / --size 1024 --ondisk sda
+#part swap --size 512 --ondisk sda
+#part /var --size 1024 --ondisk sdb
+#part swap --size 512 --ondisk sdb
+#part raid.01 --size 1 --grow --ondisk sda
+#part raid.02 --size 1 --grow --ondisk sdb
+#raid /scr --level 0 --device md0 raid.01 raid.02
+
+#Full RAID 1 Sample
+#part raid.01 --size 50 --ondisk sda
+#part raid.02 --size 50 --ondisk sdb
+#raid /boot --level 1 --device md0 raid.01 raid.02
+#
+#part raid.11 --size 1024 --ondisk sda
+#part raid.12 --size 1024 --ondisk sdb
+#raid / --level 1 --device md1 raid.11 raid.12
+#
+#part raid.21 --size 1024 --ondisk sda
+#part raid.22 --size 1024 --ondisk sdb
+#raid /var --level 1 --device md2 raid.21 raid.22
+#
+#part raid.31 --size 1024 --ondisk sda
+#part raid.32 --size 1024 --ondisk sdb
+#raid swap --level 1 --device md3 raid.31 raid.32
+#
+#part raid.41 --size 1 --grow --ondisk sda
+#part raid.42 --size 1 --grow --ondisk sdb
+#raid /scr --level 1 --device md4 raid.41 raid.42
+
+#
+# bootloader config
+# --append <args>
+# --useLilo
+# --md5pass <crypted MD5 password for GRUB>
+#
+bootloader
+
+#
+# install or upgrade
+#
+install
+
+#
+# text mode install (default is graphical)
+#
+text
+
+#
+# firewall
+#
+firewall --disabled
+
+#
+# mouse selection
+#
+#mouse genericps/2 --emulthree
+
+#
+# Select a zone
+# Add the --utc switch if your hardware clock is set to GMT
+#
+#timezone US/Hawaii
+#timezone US/Pacific
+#timezone US/Mountain
+#timezone US/Central
+#timezone US/Eastern
+timezone --utc "#TABLE:site:key=timezone:value#"
+
+#
+# Don't do X
+#
+skipx
+
+
+#
+# To generate an encrypted root password use:
+#
+# perl -e 'print crypt("blah","Xa") . "\n";'p
+# openssl passwd -apr1 -salt xxxxxxxx password
+# 
+# where "blah" is your root password.
+#
+#rootpw --iscrypted XaLGAVe1C41x2
+#rootpw XaLGAVe1C41x2 --iscrypted
+rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
+
+#
+# NIS setup: auth --enablenis --nisdomain sensenet 
+# --nisserver neptune --useshadow --enablemd5
+#
+# OR
+auth --useshadow --enablemd5
+
+#
+# SE Linux
+#
+selinux --disabled
+
+#
+# Reboot after installation
+#
+reboot
+
+#
+#end of section
+#
+%packages --ignoremissing
+#INCLUDE_DEFAULT_PKGLIST#
+%end
+%pre
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
+%end
+%post
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rh#
+%end
diff --git a/xCAT/postscripts/syslog b/xCAT/postscripts/syslog
index bdbe2e76c..bab90406a 100755
--- a/xCAT/postscripts/syslog
+++ b/xCAT/postscripts/syslog
@@ -23,7 +23,7 @@ isSN=0
 isLinux=1
 isRsyslog=0
 isC3=0
-
+systemdEnabled=0
 # pmatch determines if 1st argument string is matched by 2nd argument pattern
 
 pmatch ()
@@ -115,12 +115,19 @@ if [ "$NTYPE" = service ]; then
   isSN=1
 fi
 
+if [ -e /etc/systemd ]; then
+  systemdEnabled=1
+fi
+
 if [ "$(uname -s)" = "Linux" ]; then
   if ( pmatch $OSVER "fedora*" ) || ( pmatch $OSVER "rhels5*" ) || ( pmatch $OSVER "rhel6*" ) || ( pmatch $OSVER "rhels6*" ) || [ -f /etc/fedora-release ] || [ -f /etc/redhat-release ] || ( pmatch $OSVER "ubuntu*" ) || ( is_lsb_ubuntu ) || ( pmatch $OSVER "debian*" ); then
     if [ -e /etc/rsyslog.conf ]; then
       conf_file="/etc/rsyslog.conf"
       sysconfig="/etc/sysconfig/rsyslog"
       init="/etc/init.d/rsyslog"
+      if [ $systemdEnabled -eq 1 ]; then
+         init="rsyslog"
+      fi
       isRsyslog=1
       if ( pmatch $OSVER "ubuntu*" ) || ( is_lsb_ubuntu ) || ( pmatch $OSVER "debian*" ); then
         sysconfig="/etc/default/rsyslog"
@@ -263,7 +270,7 @@ else
       grep "xCAT settings" $conf_file 2>&1 1> /dev/null
       if [ $? -eq 0 ]; then
 	  sed "/# xCAT settings/,$ d" $conf_file >/tmp/sed.tmp
-      cat /tmp/sed.tmp >$conf_file
+          cat /tmp/sed.tmp >$conf_file
       fi
       echo "# xCAT settings" >> $conf_file
       echo "destination loghost { udp(\"$master\"); };" >> $conf_file
@@ -320,8 +327,12 @@ if [ $isLinux -eq 0 ]; then
           break
       fi
   done
-else 
-  $init restart
+else
+  if [ $systemdEnabled -eq 1 ]; then 
+    systemctl restart $init.service 
+  else
+    $init restart
+  fi
 fi
 
 #keep a record