diff --git a/etc/Makefile b/etc/Makefile
index e8f59c5..5119ccf 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -9,11 +9,11 @@
 # the applications looking for #includes.
 # It also creates the doc directories and the callgraphs, etc.
 
-APPDIRS = $(filter-out ../apps/README ../ucfk4labs/README, $(wildcard ../apps/*/ ../ucfk4labs/*/))
+APPDIRS = $(filter-out ../apps/README, $(wildcard ../apps/*/ ../lab*/*))
 DOCDIRS = $(addsuffix /doc, $(APPDIRS))
 
 # Don't link against test-scaffold if directly accessing harware
-FOO = $(shell grep -l "\<avr/io.h\>" ../ucfk4labs/*/*.c)
+FOO = $(shell grep -l "\<avr/io.h\>" ../lab*/*.c)
 DUDDIRS = $(foreach filename, $(FOO), $(dir $(filename)))
 TESTDIRS = $(filter-out $(DUDDIRS), $(APPDIRS))