diff --git a/release/sysinstall/Makefile b/release/sysinstall/Makefile
index d4b3e137bf1..1b2762e940c 100644
--- a/release/sysinstall/Makefile
+++ b/release/sysinstall/Makefile
@@ -18,7 +18,9 @@ SRCS=	anonFTP.c apache.c attr.c cdrom.c command.c config.c devices.c \
 CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR} -I/sys
 CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS -DSAVE_USERCONFIG
 
-#CFLAGS+=	-DLOAD_CONFIG_FILE=\"install.cfg\"
+.if defined(LOAD_CONFIG_FILE)
+CFLAGS+=	-DLOAD_CONFIG_FILE=\"${LOAD_CONFIG_FILE}\"
+.endif
 
 DPADD=	${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO}
 LDADD=	-ldialog -lncurses -lmytinfo -lutil -ldisk -lftpio
diff --git a/release/sysinstall/main.c b/release/sysinstall/main.c
index fcf9b52fb51..a207fb18ce9 100644
--- a/release/sysinstall/main.c
+++ b/release/sysinstall/main.c
@@ -113,8 +113,7 @@ main(int argc, char **argv)
 	if (argc > start_arg)
 	    systemShutdown(0);
     }
-
-    {
+    else {
 	FILE *fp;
 	char buf[BUFSIZ];
 
diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile
index d4b3e137bf1..1b2762e940c 100644
--- a/usr.sbin/sade/Makefile
+++ b/usr.sbin/sade/Makefile
@@ -18,7 +18,9 @@ SRCS=	anonFTP.c apache.c attr.c cdrom.c command.c config.c devices.c \
 CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR} -I/sys
 CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS -DSAVE_USERCONFIG
 
-#CFLAGS+=	-DLOAD_CONFIG_FILE=\"install.cfg\"
+.if defined(LOAD_CONFIG_FILE)
+CFLAGS+=	-DLOAD_CONFIG_FILE=\"${LOAD_CONFIG_FILE}\"
+.endif
 
 DPADD=	${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO}
 LDADD=	-ldialog -lncurses -lmytinfo -lutil -ldisk -lftpio
diff --git a/usr.sbin/sade/main.c b/usr.sbin/sade/main.c
index fcf9b52fb51..a207fb18ce9 100644
--- a/usr.sbin/sade/main.c
+++ b/usr.sbin/sade/main.c
@@ -113,8 +113,7 @@ main(int argc, char **argv)
 	if (argc > start_arg)
 	    systemShutdown(0);
     }
-
-    {
+    else {
 	FILE *fp;
 	char buf[BUFSIZ];
 
diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile
index d4b3e137bf1..1b2762e940c 100644
--- a/usr.sbin/sysinstall/Makefile
+++ b/usr.sbin/sysinstall/Makefile
@@ -18,7 +18,9 @@ SRCS=	anonFTP.c apache.c attr.c cdrom.c command.c config.c devices.c \
 CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR} -I/sys
 CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS -DSAVE_USERCONFIG
 
-#CFLAGS+=	-DLOAD_CONFIG_FILE=\"install.cfg\"
+.if defined(LOAD_CONFIG_FILE)
+CFLAGS+=	-DLOAD_CONFIG_FILE=\"${LOAD_CONFIG_FILE}\"
+.endif
 
 DPADD=	${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO}
 LDADD=	-ldialog -lncurses -lmytinfo -lutil -ldisk -lftpio
diff --git a/usr.sbin/sysinstall/main.c b/usr.sbin/sysinstall/main.c
index fcf9b52fb51..a207fb18ce9 100644
--- a/usr.sbin/sysinstall/main.c
+++ b/usr.sbin/sysinstall/main.c
@@ -113,8 +113,7 @@ main(int argc, char **argv)
 	if (argc > start_arg)
 	    systemShutdown(0);
     }
-
-    {
+    else {
 	FILE *fp;
 	char buf[BUFSIZ];