diff --git a/kdump.service b/kdump.service
index 0e1d103..07e97fa 100644
--- a/kdump.service
+++ b/kdump.service
@@ -8,5 +8,5 @@ ExecStart=/usr/bin/kdumpctl start
 ExecStop=/usr/bin/kdumpctl stop
 RemainAfterExit=yes
 
-
-
+[Install]
+WantedBy=multi-user.target
diff --git a/kexec-tools.spec b/kexec-tools.spec
index 3e9ac56..18551b7 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.3
-Release: 39%{?dist}
+Release: 40%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -123,7 +123,6 @@ make -C kexec-tools-po
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
 mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 mkdir -p -m755 $RPM_BUILD_ROOT%{_localstatedir}/crash
 mkdir -p -m755 $RPM_BUILD_ROOT%{_mandir}/man8/
@@ -131,7 +130,7 @@ mkdir -p -m755 $RPM_BUILD_ROOT%{_mandir}/man5/
 mkdir -p -m755 $RPM_BUILD_ROOT%{_docdir}
 mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/kdump
 mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
-mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/
+mkdir -p $RPM_BUILD_ROOT%{_unitdir}
 mkdir -p -m755 $RPM_BUILD_ROOT%{_bindir}
 install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/kdumpctl
 
@@ -175,7 +174,6 @@ if [ $1 -eq 1 ] ; then
     /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 fi
 touch /etc/kdump.conf
-/sbin/chkconfig --add kdump
 # This portion of the script is temporary.  Its only here
 # to fix up broken boxes that require special settings 
 # in /etc/sysconfig/kdump.  It will be removed when 
@@ -287,6 +285,9 @@ done
 
 
 %changelog
+* Wed Feb 22 2012 Cong Wang <xiyou.wangcong@gmail.com> - 2.0.2-40
+- Fixup sysytemd service file
+
 * Wed Feb 22 2012 Dave Young <ruyang@redhat.com> - 2.0.2-39
 - Add ssh dump support, resolve bug 789253.