diff --git a/sys/Makefile.am b/sys/Makefile.am
index 101ea5a514..98297dc5a9 100644
--- a/sys/Makefile.am
+++ b/sys/Makefile.am
@@ -1,5 +1,17 @@
-### use HAVE_ stuff to decide on dirs
-DIRS=qcam v4l vcdsrc vgasink xvideosink
+### FIXME use HAVE_ stuff to decide on dirs
+if USE_VGA
+VGA_SUBDS=vga
+else
+VGA_SUBDS=
+endif
 
-DIST_SUBDIRS=qcam v4l vcdsrc vgasink xvideosink
+if USE_OSS
+OSS_SUBDS=oss
+else
+OSS_SUBDS=
+endif
+
+SUBDIRS=$(OSS_SUBDS) qcam v4l vcd $(VGA_SUBDS) xvideo
+
+DIST_SUBDIRS=oss qcam v4l vcd vga xvideo