diff --git a/Makefile.unix b/Makefile.unix
index bb24978897..75c9a849d7 100644
--- a/Makefile.unix
+++ b/Makefile.unix
@@ -470,32 +470,32 @@ pass2dep: context tools/mkdeps$(HOSTEXEEXT) tools/cnvwindeps$(HOSTEXEEXT)
 # location: http://ymorin.is-a-geek.org/projects/kconfig-frontends.  See
 # README.txt file in the NuttX tools GIT repository for additional information.
 
-do_config: context apps_preconfig
+do_config: dirlinks apps_preconfig
 	$(Q) APPSDIR=${CONFIG_APPS_DIR} kconfig-conf Kconfig
 
 config: do_config clean_context
 
-do_oldconfig: context apps_preconfig
+do_oldconfig: dirlinks apps_preconfig
 	$(Q) APPSDIR=${CONFIG_APPS_DIR} kconfig-conf --oldconfig Kconfig
 
 oldconfig: do_oldconfig clean_context
 
-do_olddefconfig: context apps_preconfig
+do_olddefconfig: dirlinks apps_preconfig
 	$(Q) APPSDIR=${CONFIG_APPS_DIR} kconfig-conf --olddefconfig Kconfig
 
 olddefconfig: do_olddefconfig clean_context
 
-do_menuconfig: context apps_preconfig
+do_menuconfig: dirlinks apps_preconfig
 	$(Q) APPSDIR=${CONFIG_APPS_DIR} kconfig-mconf Kconfig
 
 menuconfig: do_menuconfig clean_context
 
-do_qconfig: context apps_preconfig
+do_qconfig: dirlinks apps_preconfig
 	$(Q) APPSDIR=${CONFIG_APPS_DIR} kconfig-qconf Kconfig
 
 qconfig: do_qconfig clean_context
 
-gconfig: context apps_preconfig
+gconfig: dirlinks apps_preconfig
 	$(Q) APPSDIR=${CONFIG_APPS_DIR} kconfig-gconf Kconfig
 
 gconfig: do_gconfig clean_context
diff --git a/Makefile.win b/Makefile.win
index 1f30310525..87b263b020 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -466,22 +466,22 @@ pass2dep: context tools\mkdeps$(HOSTEXEEXT)
 # location: http://ymorin.is-a-geek.org/projects/kconfig-frontends.  See
 # misc\tools\README.txt for additional information.
 
-do_config: context apps_preconfig
+do_config: dirlinks apps_preconfig
 	$(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-conf Kconfig
 
 config: do_config clean_context
 
-do_oldconfig: context apps_preconfig
+do_oldconfig: dirlinks apps_preconfig
 	$(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-conf --oldconfig Kconfig
 
 oldconfig: do_oldconfig clean_context
 
-do_olddefconfig: context apps_preconfig
+do_olddefconfig: dirlinks apps_preconfig
 	$(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-conf --olddefconfig Kconfig
 
 olddefconfig: do_olddefconfig clean_context
 
-do_menuconfig: context configenv apps_preconfig
+do_menuconfig: dirlinks configenv apps_preconfig
 	$(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-mconf Kconfig
 
 menuconfig: do_menuconfig clean_context