diff --git a/Makefile b/Makefile
index 79782b817..3adfa7ca4 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # apps/Makefile
 #
 #   Copyright (C) 2011 Uros Platise. All rights reserved.
-#   Copyright (C) 2011-2014 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011-2014, 2018 Gregory Nutt. All rights reserved.
 #   Authors: Uros Platise <uros.platise@isotel.eu>
 #            Gregory Nutt <gnutt@nuttx.org>
 #
@@ -76,7 +76,7 @@ BIN = libapps$(LIBEXT)
 # Build targets
 
 all: $(BIN)
-.PHONY: import install dirlinks context context_serialize context_rest .depdirs preconfig depend clean distclean
+.PHONY: import install dirlinks context context_serialize clean_context context_rest .depdirs preconfig depend clean distclean
 .PRECIOUS: libapps$(LIBEXT)
 
 define MAKE_template
@@ -135,6 +135,9 @@ preconfig: Kconfig
 
 depend: .depend
 
+clean_context:
+	$(Q) $(MAKE) -C platform clean_context TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
+
 clean: $(foreach SDIR, $(CLEANDIRS), $(SDIR)_clean)
 	$(call DELFILE, $(BIN))
 	$(call DELFILE, Kconfig)
diff --git a/platform/Makefile b/platform/Makefile
index 23dde311d..6810ae62e 100644
--- a/platform/Makefile
+++ b/platform/Makefile
@@ -87,7 +87,7 @@ endif
 # Build targets
 
 all: .built
-.PHONY: context .depend depend clean distclean preconfig
+.PHONY: context .depend depend clean_context clean distclean preconfig
 .PRECIOUS: ../libapps$(LIBEXT)
 
 ifneq ($(ASRCS),)
@@ -135,14 +135,16 @@ depend: .depend
 
 # Clean targets
 
+clean_context:
+	$(Q) $(DIRUNLINK) $(PLATFORMDIR)
+
 clean:
 	$(call DELFILE, .built)
 	$(Q) $(MAKE) -C bin TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" clean
 
-distclean: clean
+distclean: clean clean_context
 	$(call DELFILE, Make.dep)
 	$(call DELFILE, .depend)
-	$(Q) $(DIRUNLINK) $(PLATFORMDIR)
 
 preconfig: