diff --git a/config.d/build_control.m4 b/config.d/build_control.m4
index ab64f5fba..ff4b17d8e 100644
--- a/config.d/build_control.m4
+++ b/config.d/build_control.m4
@@ -53,6 +53,7 @@ if test "x$HAVE_FBDEV" = xyes; then
 		QF_NEED(qw, [client common])
 		QF_NEED(nq, [client common])
 		QF_NEED(console, [client])
+		QF_NEED(libs,[util gamecode ruamoko gib audio image models video console net qw client])
 	fi
 fi
 if test "x$HAVE_X" = xyes; then
@@ -83,6 +84,7 @@ if test "x$HAVE_X" = xyes; then
 		QF_NEED(qw, [client common])
 		QF_NEED(nq, [client common])
 		QF_NEED(console, [client])
+		QF_NEED(libs,[util gamecode ruamoko gib audio image models video console net qw client])
 	fi
 fi
 if test "x$HAVE_SDL" = xyes; then
@@ -106,6 +108,7 @@ if test "x$HAVE_SDL" = xyes; then
 		QF_NEED(qw, [client common sdl])
 		QF_NEED(nq, [client common sdl])
 		QF_NEED(console, [client])
+		QF_NEED(libs,[util gamecode ruamoko gib audio image models video console net qw client])
 	fi
 fi
 if test "x$HAVE_SVGA" = xyes; then
@@ -127,6 +130,7 @@ if test "x$HAVE_SVGA" = xyes; then
 		QF_NEED(qw, [client common])
 		QF_NEED(nq, [client common])
 		QF_NEED(console, [client])
+		QF_NEED(libs,[util gamecode ruamoko gib audio image models video console net qw client])
 	fi
 fi
 #if test "x$mingw" = xyes; then
@@ -145,6 +149,7 @@ fi
 #		QF_NEED(qw, [client common])
 #		QF_NEED(nq, [client common])
 #		QF_NEED(console, [client])
+#		QF_NEED(libs,[util gamecode ruamoko gib audio image models video console net qw client])
 #	fi
 #fi
 
@@ -179,42 +184,55 @@ fi
 
 if test "x$ENABLE_tools_bsp2img" = xyes; then
 	QF_NEED(tools,[bsp2img])
+	QF_NEED(libs,[image util])
 fi
 if test "x$ENABLE_tools_carne" = xyes; then
 	QF_NEED(tools,[carne])
+	QF_NEED(libs,[gib ruamoko gamecode util])
 fi
 if test "x$ENABLE_tools_pak" = xyes; then
 	QF_NEED(tools,[pak])
+	QF_NEED(libs,[util])
 fi
 if test "x$ENABLE_tools_qfbsp" = xyes; then
 	QF_NEED(tools,[qfbsp])
+	QF_NEED(libs,[models image util])
 fi
 if test "x$ENABLE_tools_qfcc" = xyes; then
 	QF_NEED(tools,[qfcc])
+	QF_NEED(libs,[gamecode util])
 fi
 if test "x$ENABLE_tools_qflight" = xyes; then
 	QF_NEED(tools,[qflight])
+	QF_NEED(libs,[util])
 fi
 if test "x$ENABLE_tools_qflmp" = xyes; then
 	QF_NEED(tools,[qflmp])
+	QF_NEED(libs,[util])
 fi
 if test "x$ENABLE_tools_qfmodelgen" = xyes; then
 	QF_NEED(tools,[qfmodelgen])
+	QF_NEED(libs,[util])
 fi
 if test "x$ENABLE_tools_qfspritegen" = xyes; then
 	QF_NEED(tools,[qfspritegen])
+	QF_NEED(libs,[util])
 fi
 if test "x$ENABLE_tools_qfvis" = xyes; then
 	QF_NEED(tools,[qfvis])
+	QF_NEED(libs,[util])
 fi
 if test "x$ENABLE_tools_qwaq" = xyes; then
 	QF_NEED(tools,[qwaq])
+	QF_NEED(libs,[ruamoko gamecode util])
 fi
 if test "x$ENABLE_tools_wad" = xyes; then
 	QF_NEED(tools,[wad])
+	QF_NEED(libs,[image util])
 fi
 if test "x$ENABLE_tools_wav" = xyes; then
 	QF_NEED(tools,[wav])
+	QF_NEED(libs,[util])
 fi
 
 QF_NEED(top, [libs hw nq qtv qw])
@@ -222,6 +240,8 @@ QF_NEED(top, [libs hw nq qtv qw])
 QF_PROCESS_NEED_DIRS(tools,[bsp2img carne pak qfbsp qfcc qflight qflmp qfmodelgen qfspritegen qfvis qwaq wad wav])
 QF_PROCESS_NEED_FUNC(tools,[bsp2img carne pak qfbsp qfcc qflight qflmp qfmodelgen qfspritegen qfvis qwaq wad wav], QF_NEED(top,tools))
 
+QF_PROCESS_NEED_DIRS(libs,[util gamecode ruamoko gib audio image models video console net qw client])
+
 if test "$ENABLE_tools_qfcc" = "yes" -a "$ENABLE_tools_pak" = "yes"; then
 	QF_NEED(top, [ruamoko])
 fi
diff --git a/libs/Makefile.am b/libs/Makefile.am
index 49dcf79af..5c14c7d00 100644
--- a/libs/Makefile.am
+++ b/libs/Makefile.am
@@ -7,5 +7,6 @@ AUTOMAKE_OPTIONS= foreign
 # models depends on image
 # video depends on models(?), image(?) and ruamoko
 # console depends on video, ruamoko and audio
-SUBDIRS=util gamecode ruamoko gib audio image models video console \
-		net qw client
+SUBDIRS=@libs_dirs@
+DIST_SUBDIRS=util gamecode ruamoko gib audio image models video console \
+			 net qw client