diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6897d60..36c18d2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ Release history for s390-tools (MIT version)
   - dbginfo.sh: Collect config files of systemd-modules-load.service
 
   Bug Fixes:
+  - dbginfo.sh: Collect all places where modprobe.d config files could exist
 
 * __v2.20.0 (2022-02-04)__
 
diff --git a/scripts/dbginfo.sh b/scripts/dbginfo.sh
index 8b1e6c09..397b67d0 100755
--- a/scripts/dbginfo.sh
+++ b/scripts/dbginfo.sh
@@ -403,11 +403,15 @@ CONFIGFILES="\
   /etc/systemd\
   /etc/udev*\
   /etc/xinet.d\
+  /lib/modprobe.d\
   $(find /lib/modules -name modules.dep 2>/dev/null)\
   /lib/systemd/system/docker.service\
+  /usr/lib/modprobe.d\
   /usr/lib/modules-load.d/*.conf\
   /usr/lib/systemd/system\
+  /usr/local/lib/modprobe.d\
   /usr/local/lib/modules-load.d/*.conf\
+  /run/modprobe.d\
   /run/modules-load.d/*.conf\
   /run/udev/chreiplzfcpmp-ipl-volume-id\
   /run/udev/rules.d\