diff --git a/bin/Makefile b/bin/Makefile
index 241a38b..92d044c 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -93,22 +93,17 @@ endif
 
 # DATA.
 DATA_AI   := 	$(wildcard ../scripts/ai/*.lua \
-										../scripts/ai/include/*.lua \
-										../scripts/ai/tpl/*.lua)
+										../scripts/ai/*/*.lua)
 DATA_GFX  := 	$(wildcard ../gfx/*.png \
-										../gfx/loading/*.png \
-										../gfx/gui/*.png \
-										../gfx/logo/*.png \
-										../gfx/outfit/space/*.png \
-										../gfx/outfit/store/*.png \
-										../gfx/planet/exterior/*.png \
-										../gfx/planet/space/*.png \
-										../gfx/ship/*.png \
-										../gfx/spfx/*.png)
+										../gfx/*/*.png \
+										../gfx/*/*/*.png)
 DATA_XML  := 	$(wildcard ../dat/*.xml ../dat/*.ttf ../dat/intro)
 DATA_SND  := 	$(wildcard ../snd/music/*.ogg \
 										../snd/sounds/*.wav) ../snd/music.lua
-DATA_MISN := 	$(wildcard ../dat/missions/*.lua)
+DATA_MISN := 	$(wildcard ../dat/missions/*.lua \
+										../dat/missions/*/*.lua \
+										../dat/mission/*/*/*.lua)
+
 DATA      := 	ldata
 DATAFILES := 	$(DATA_AI) $(DATA_GFX) $(DATA_XML) $(DATA_SND) $(DATA_MISN)