diff --git a/Makefile b/Makefile
index eba340467ec..bf2859aca44 100644
--- a/Makefile
+++ b/Makefile
@@ -71,6 +71,7 @@ ADDON_DIRS	:= $(PCODE_DIR) $(NX_DIR)
 
 NONFSDIRS	= sched lib $(ARCH_SRC) mm examples/$(CONFIG_EXAMPLE) $(ADDON_DIRS)
 FSDIRS		= fs drivers binfmt
+CONTEXTDIRS	=
 
 ifeq ($(CONFIG_NET),y)
 NONFSDIRS	+= net netutils
@@ -78,6 +79,7 @@ endif
 
 ifeq ($(CONFIG_NX),y)
 NONFSDIRS	+= graphics
+CONTEXTDIRS	+= graphics
 endif
 
 # CLEANDIRS are the directories that will clean in.  These are
@@ -189,6 +191,9 @@ endif
 dirlinks: include/arch include/arch/board include/arch/chip $(ARCH_SRC)/board $(ARCH_SRC)/chip
 
 context: check_context include/nuttx/config.h dirlinks
+	@for dir in $(CONTEXTDIRS) ; do \
+		$(MAKE) -C $$dir TOPDIR="$(TOPDIR)" context ; \
+	done
 
 clean_context:
 	@rm -f include/nuttx/config.h
diff --git a/graphics/Makefile b/graphics/Makefile
index 22c0e6d7e85..ea7580dd543 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -86,7 +86,7 @@ VPATH		= nxglib:nxbe:nxsu:nxtk:nxfonts
 endif
 
 all:	mklibgraphics
-.PHONY : depend clean distclean mklibgraphics gensources gen1bppsources \
+.PHONY : context depend clean distclean mklibgraphics gensources gen1bppsources \
 	 gen2bppsource gen4bppsource gen8bppsource gen16bppsource gen24bppsource \
 	 gen32bppsources
 
@@ -138,6 +138,8 @@ mklibgraphics: gensources $(BIN)
 
 depend: .depend
 
+context: gensources
+
 clean:
 	@make -C nxglib -f Makefile.sources clean TOPDIR=$(TOPDIR)
 	@make -C nxfonts -f Makefile.sources clean TOPDIR=$(TOPDIR)
@@ -150,3 +152,4 @@ distclean: clean
 	@rm -f Make.dep .depend
 
 -include Make.dep
+