Index: stand/common/commands.c
===================================================================
--- stand/common/commands.c
+++ stand/common/commands.c
@@ -132,7 +132,7 @@
 	char	*topic, *subtopic, *t, *s, *d;
 
 	/* page the help text from our load path */
-	snprintf(buf, sizeof(buf), "%s/boot/loader.help", getenv("loaddev"));
+	snprintf(buf, sizeof(buf), "%s/boot/loader.help", getenv("currdev"));
 	if ((hfd = open(buf, O_RDONLY)) < 0) {
 		printf("Verbose help not available, "
 		    "use '?' to list commands\n");
Index: stand/loader.mk
===================================================================
--- stand/loader.mk
+++ stand/loader.mk
@@ -165,7 +165,6 @@
 CFLAGS+=	-DELF_VERBOSE
 .endif
 
-.if !empty(HELP_FILES)
 HELP_FILES+=	${LDRSRC}/help.common
 
 CLEANFILES+=	loader.help
@@ -173,4 +172,3 @@
 
 loader.help: ${HELP_FILES}
 	cat ${HELP_FILES} | awk -f ${LDRSRC}/merge_help.awk > ${.TARGET}
-.endif