diff --git a/kdump-collect.sh b/kdump-collect.sh
index 933c6a4..4ef0b23 100644
--- a/kdump-collect.sh
+++ b/kdump-collect.sh
@@ -16,8 +16,8 @@
 #  We have a more controlled situation with regards the config
 #  files here, since we manually added them in the initrd and
 #  the validation also happened there, during such addition,
-#  hence not requiring checking here.
-for cfg in "/usr/lib/kdump/conf/"/*; do
+#  hence not requiring checks here.
+for cfg in "/usr/share/kdump.d"/*; do
 	. "$cfg"
 done
 
diff --git a/module-setup.sh b/module-setup.sh
index 75016d1..1cc6992 100644
--- a/module-setup.sh
+++ b/module-setup.sh
@@ -25,20 +25,6 @@ install() {
         exit 1
     fi
 
-    #  First clear all unnecessary firmwares/drivers added by drm in order to
-    #  reduce the size of this minimal initramfs being created. This should
-    #  be already done via command-line arguments, but let's play safe and delete
-    #  from here as well just in case.
-    rm -rf "$initdir"/usr/lib/firmware/amdgpu/
-    rm -rf "$initdir"/usr/lib/modules/*/kernel/drivers/gpu/drm/amd/*
-
-    #  Install necessary binaries
-    inst date
-    inst sync
-    inst makedumpfile
-
-    mkdir -p "$initdir"/usr/lib/kdump/conf
-
     #  Load the necessary external variables, otherwise it'll fail later.
     HAVE_CFG_FILES=0
     shopt -s nullglob
@@ -55,7 +41,20 @@ install() {
         exit 1
     fi
 
-    cp -LR --preserve=all "/usr/share/kdump.d"/* "$initdir"/usr/lib/kdump/conf/
+    #  First clear all unnecessary firmwares/drivers added by drm in order to
+    #  reduce the size of this minimal initramfs being created. This should
+    #  be already done via command-line arguments, but let's play safe and delete
+    #  from here as well just in case.
+    rm -rf "$initdir"/usr/lib/firmware/amdgpu/
+    rm -rf "$initdir"/usr/lib/modules/*/kernel/drivers/gpu/drm/amd/*
+
+    #  Install necessary binaries
+    inst date
+    inst sync
+    inst makedumpfile
+
+    mkdir -p "$initdir"/usr/share/kdump.d/
+    cp -LR --preserve=all /usr/share/kdump.d/* "$initdir"/usr/share/kdump.d/
 
     #  Determine the numerical devnode for kdump, and save it on initrd;
     #  notice that partset link is not available that early in boot time.