diff --git a/Makefile b/Makefile
index af301848..2e62f4fa 100644
--- a/Makefile
+++ b/Makefile
@@ -197,7 +197,12 @@ MANPAGES := $(LIBMAN3FILES) $(LIBMAN5FILES) $(PROGDETECTMAN8FILES) $(PROGDUMPMAN
 
 check:: test
 
-test:: lib/test/test-scanner
+test:: shellcheck test-lib
+
+shellcheck::
+	shellcheck $(SHELLCHECKFILES)
+
+test-lib:: lib/test/test-scanner
 	cd lib/test ; ./test-scanner.pl
 
 user ::
diff --git a/prog/debug/Module.mk b/prog/debug/Module.mk
index 9efc00d8..79cbc811 100644
--- a/prog/debug/Module.mk
+++ b/prog/debug/Module.mk
@@ -29,6 +29,8 @@ PROGDEBUGTARGETS += $(MODULE_DIR)/sensors-save
 REMOVEDEBUGBIN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(BINDIR)/%,$(PROGDEBUGTARGETS))
 REMOVEDEBUGMAN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(PROGDEBUGMAN1DIR)/%,$(PROGDEBUGMAN1FILES))
 
+SHELLCHECKFILES += $(PROGDEBUGTARGETS)
+
 install-prog-debug: $(PROGDEBUGTARGETS)
 	$(MKDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(PROGDEBUGMAN1DIR)
 	$(INSTALL) -m 755 $(PROGDEBUGTARGETS) $(DESTDIR)$(BINDIR)
diff --git a/prog/debug/sensors-find-driver b/prog/debug/sensors-find-driver
index 0cc001d0..5f24cac6 100755
--- a/prog/debug/sensors-find-driver
+++ b/prog/debug/sensors-find-driver
@@ -74,7 +74,7 @@ while true; do
 		DRIVER_DIR=$(readlink -f "$DEVICE/driver")
 		DRIVER=$(basename "$DRIVER_DIR")
 		if [ -L "$DRIVER_DIR/module" ]; then
-			MODULE=$(basename $(readlink "$DRIVER_DIR/module"))
+			MODULE="$(basename "$(readlink "$DRIVER_DIR/module")")"
 		fi
 		break
 	elif [ -L "$DEVICE/device" ]; then