diff --git a/Makefile.custom b/Makefile.custom
index 13da38e76..ce808196a 100644
--- a/Makefile.custom
+++ b/Makefile.custom
@@ -42,9 +42,10 @@ check test: busybox
 	bindir=$(objtree) srcdir=$(srctree)/testsuite SED="$(SED)" \
 	$(SHELL) $(srctree)/testsuite/runtest $(if $(KBUILD_VERBOSE:1=),-v)
 
-### checkhelp:
-### 	$(Q)$(srctree)/scripts/checkhelp.awk \
-### 		$(wildcard $(patsubst %,%/Config.in,$(SRC_DIRS) ./))
+.PHONY: checkhelp
+checkhelp:
+	$(Q)$(srctree)/scripts/checkhelp.awk \
+		$(patsubst %,$(srctree)/%,$(wildcard $(patsubst %,%/Config.in,$(busybox-dirs) ./)))
 
 .PHONY: sizes
 sizes: busybox_unstripped
diff --git a/scripts/checkhelp.awk b/scripts/checkhelp.awk
index 608a46e58..4bb4996dc 100755
--- a/scripts/checkhelp.awk
+++ b/scripts/checkhelp.awk
@@ -20,10 +20,10 @@
 		help[pos] = 0;
 	}
 }
-/^[[:space:]]*help[[:space:]]*$/ {
+/^[ \t]*help[ \t]*$/ {
 	help[pos] = 1;
 }
-/^[[:space:]]*bool[[:space:]]*$/ {
+/^[ \t]*bool[ \t]*$/ {
 	help[pos] = 1; # ignore options which are not selectable
 }
 BEGIN {
@@ -31,8 +31,8 @@ BEGIN {
 	is_choice = 0;
 }
 END {
-	for (i = 0; i < pos; i++) {
-#	printf("%s: help for #%i '%s' == %i\n", file[i], i, conf[i], help[i]);
+	for (i = 0; i <= pos; i++) {
+# 	printf("%s: help for #%i '%s' == %i\n", file[i], i, conf[i], help[i]);
 		if (help[i] == 0) {
 			printf("%s: No helptext for '%s'\n", file[i], conf[i]);
 		}