diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..029d2b3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+SOURCES/eppic_030413.tar.gz
+SOURCES/kexec-tools-2.0.4.tar.bz2
+SOURCES/kexec-tools-po-20131224.tgz
+SOURCES/makedumpfile-1.5.4.tar.gz
diff --git a/.kexec-tools.metadata b/.kexec-tools.metadata
index 3927396..19a95a4 100644
--- a/.kexec-tools.metadata
+++ b/.kexec-tools.metadata
@@ -1,4 +1,4 @@
 dcdb6d2488c8a31ae95563e2113860ae16256c8f SOURCES/eppic_030413.tar.gz
-6da479b880470fd57ecf040e0b1d1ffce21f168b SOURCES/kexec-tools-po-20131224.tgz
 f119507a92446bcda58b108fd7f61e6d9f187358 SOURCES/kexec-tools-2.0.4.tar.bz2
+6da479b880470fd57ecf040e0b1d1ffce21f168b SOURCES/kexec-tools-po-20131224.tgz
 077dfb8fbf2f12b5efca385eb1fda55dee2096d5 SOURCES/makedumpfile-1.5.4.tar.gz
diff --git a/SOURCES/kdump-dep-generator.sh b/SOURCES/kdump-dep-generator.sh
new file mode 100644
index 0000000..b6fab2d
--- /dev/null
+++ b/SOURCES/kdump-dep-generator.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# More details about systemd generator:
+# http://www.freedesktop.org/wiki/Software/systemd/Generators/
+
+. /usr/lib/kdump/kdump-lib.sh
+
+# If invokded with no arguments for testing purpose, output to /tmp to
+# avoid overriding the existing.
+dest_dir="/tmp"
+
+if [ -n "$1" ]; then
+    dest_dir=$1
+fi
+
+systemd_dir=/usr/lib/systemd/system
+kdump_wants=$dest_dir/kdump.service.wants
+
+if is_ssh_dump_target; then
+    mkdir -p $kdump_wants
+    ln -sf $systemd_dir/network-online.target $kdump_wants/
+fi
diff --git a/SPECS/kexec-tools.spec b/SPECS/kexec-tools.spec
index 498ffd3..03997d5 100644
--- a/SPECS/kexec-tools.spec
+++ b/SPECS/kexec-tools.spec
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.4
-Release: 30%{?dist}
+Release: 32%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -27,6 +27,7 @@ Source19: eppic_030413.tar.gz
 Source20: kdump-lib.sh
 Source21: kdump-in-cluster-environment.txt
 Source22: supported-kdump-targets.txt
+Source23: kdump-dep-generator.sh
 
 #######################################
 # These are sources for mkdumpramfs
@@ -219,6 +220,7 @@ install -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/98-kexec.r
 %endif
 install -m 644 %{SOURCE15} $RPM_BUILD_ROOT%{_mandir}/man5/kdump.conf.5
 install -m 644 %{SOURCE16} $RPM_BUILD_ROOT%{_unitdir}/kdump.service
+install -m 755 -D %{SOURCE23} $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-generators/kdump-dep-generator.sh
 mkdir -p $RPM_BUILD_ROOT/usr/sbin
 install -m 755 %{SOURCE17} $RPM_BUILD_ROOT/usr/sbin/rhcrashkernel-param
 
@@ -358,6 +360,7 @@ done
 %{_mandir}/man8/*
 %{_mandir}/man5/*
 %{_unitdir}/kdump.service
+%{_prefix}/lib/systemd/system-generators/kdump-dep-generator.sh
 %doc News
 %doc COPYING
 %doc TODO
@@ -371,6 +374,12 @@ done
 %endif
 
 %changelog
+* Wed Apr 30 2014 Madper Xie <cxie@redhat.com> - 2.0.4-32
+- spec: fix wrong source id
+
+* Wed Apr 30 2014 WANG Chao <chaowang@redhat.com> - 2.0.4-31
+- generate kdump service dependencies on the fly
+
 * Wed Mar 26 2014 WANG Chao <chaowang@redhat.com> - 2.0.4-30
 - fix issue when dump path is mounted on nfs.