diff --git a/Makefile.include b/Makefile.include
index 68cba85bb..710725806 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -93,9 +93,9 @@ PROJECT_OBJECTFILES = ${addprefix $(OBJECTDIR)/,${call oname, $(PROJECT_SOURCEFI
 
 ifdef APPS
   APPDIRS += ${wildcard ${addprefix $(CONTIKI)/apps/, $(APPS)} \
-                ${addprefix $(CONTIKI)/platform/$(TARGET)/apps/, $(APPS)} \
-		${addprefix , $(APPS)}}
-  APPINCLUDES = ${foreach APP, $(APPS), ${wildcard \
+	     ${addprefix $(CONTIKI)/platform/$(TARGET)/apps/, $(APPS)} \
+	     ${addprefix , $(APPS)}}
+  APPINCLUDES = ${foreach APP, $(APPS),  ${wildcard ${foreach DIR, $(APPDIRS), $(DIR)/Makefile.$(APP)} \
                  $(CONTIKI)/apps/$(APP)/Makefile.$(APP) \
                  $(CONTIKI)/platform/$(TARGET)/apps/$(APP)/Makefile.$(APP) \
 	         $(APP)/Makefile.$(APP)}}