diff --git a/kdump_dracut_modules/99kdumpbase/kdump.sh b/dracut-kdump.sh
similarity index 100%
rename from kdump_dracut_modules/99kdumpbase/kdump.sh
rename to dracut-kdump.sh
diff --git a/kdump_dracut_modules/99kdumpbase/module-setup.sh b/dracut-module-setup.sh
similarity index 100%
rename from kdump_dracut_modules/99kdumpbase/module-setup.sh
rename to dracut-module-setup.sh
diff --git a/kdump_dracut_modules/99kdumpbase/monitor_dd_progress b/dracut-monitor_dd_progress
similarity index 100%
rename from kdump_dracut_modules/99kdumpbase/monitor_dd_progress
rename to dracut-monitor_dd_progress
diff --git a/kexec-tools.spec b/kexec-tools.spec
index d89d2b9..bfdc537 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -26,7 +26,9 @@ Source16: kdump.service
 # These are sources for mkdumpramfs
 # Which is currently in development
 #######################################
-Source100: dracut-files.tbz2
+Source100: dracut-kdump.sh
+Source101: dracut-module-setup.sh
+Source102: dracut-monitor_dd_progress
 
 Requires(post): systemd-units
 Requires(preun): systemd-units
@@ -155,12 +157,16 @@ install -m 644 makedumpfile-1.4.2/makedumpfile.8.gz $RPM_BUILD_ROOT/%{_mandir}/m
 make -C kexec-tools-po install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
+%define remove_dracut_prefix() %(echo -n %1|sed 's/.*dracut-//g')
 
-# untar the dracut package
-mkdir -p -m755 $RPM_BUILD_ROOT/etc/kdump-adv-conf
-tar -C $RPM_BUILD_ROOT/etc/kdump-adv-conf -jxvf %{SOURCE100}
-chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/module-setup.sh
-chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/kdump.sh
+# deal with dracut modules
+mkdir -p -m755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase
+cp %{SOURCE100} $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix %{SOURCE100}}
+cp %{SOURCE101} $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix %{SOURCE101}}
+cp %{SOURCE102} $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix %{SOURCE102}}
+
+chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix %{SOURCE100}}
+chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix %{SOURCE101}}
 
 
 %define dracutlibdir %{_prefix}/lib/dracut
diff --git a/sources b/sources
index 74e4225..5188ce0 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
 3e802d638dce0080b910f15908c04a24  kexec-tools-po.tar.gz
 b3ced2097ce3981abba38ceedc84f939  kexec-tools-2.0.3.tar.bz2
 a98917a8dab5e590549bff9fe7b3a5c2  makedumpfile-1.4.2.tar.gz
-14d710b19f1fa254dae77ec184b6a7c1  dracut-files.tbz2