diff --git a/configure.ac b/configure.ac
index a7f2ba045..0ed59fb63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2169,7 +2169,7 @@ for l in $CLIENT_PLUGIN_STATIC; do
 	CLIENT_PLUGIN_PROTOS="$CLIENT_PLUGIN_PROTOS extern plugin_t *${n}_PluginInfo (void);"
 done
 for l in $CD_PLUGIN_STATIC; do
-	CD_PLUGIN_STATIC_LIBS="$CD_PLUGIN_STATIC_LIBS cd/$l"
+	CD_PLUGIN_STATIC_LIBS="$CD_PLUGIN_STATIC_LIBS $l"
 	n="`echo $l | sed -e 's/\(.*\)\.la/\1/'`"
 	CD_PLUGIN_LIST='{"'"$n"'"'", ${n}_PluginInfo},$CD_PLUGIN_LIST"
 	CD_PLUGIN_PROTOS="$CD_PLUGIN_PROTOS extern plugin_t *${n}_PluginInfo (void);"
@@ -2317,7 +2317,6 @@ AC_OUTPUT(
 
 	libs/Makefile
 	libs/audio/Makefile
-	libs/audio/cd/Makefile
 	libs/audio/targets/Makefile
 	libs/audio/renderer/Makefile
 	libs/console/Makefile
diff --git a/libs/Makefile.am b/libs/Makefile.am
index 08972552e..56d482972 100644
--- a/libs/Makefile.am
+++ b/libs/Makefile.am
@@ -5,5 +5,5 @@ AUTOMAKE_OPTIONS= foreign
 # ruamoko depends on gamecode (engine only, not builtins)
 # audio depends on gamecode
 # console depends on ruamoko and audio
-SUBDIRS=util gib gamecode ruamoko audio console image models net qw \
+SUBDIRS=util gib gamecode ruamoko models audio console image net qw \
 		video
diff --git a/libs/console/Makefile.am b/libs/console/Makefile.am
index d5a6a504a..15486127f 100644
--- a/libs/console/Makefile.am
+++ b/libs/console/Makefile.am
@@ -22,9 +22,9 @@ libQFconsole_la_LIBADD=		$(plugin_libadd) $(top_builddir)/libs/util/libQFutil.la
 libQFconsole_la_SOURCES=	$(common_sources)
 
 console_client_la_LDFLAGS=	$(plugin_ldflags)
-console_client_la_LIBADD=	$(plugin_libadd) $(top_builddir)/libs/audio/libQFsound.la $(top_builddir)/libs/ruamoko/libQFruamoko.la
+console_client_la_LIBADD=	$(plugin_libadd) libQFconsole.la $(top_builddir)/libs/audio/libQFsound.la $(top_builddir)/libs/ruamoko/libQFruamoko.la $(top_builddir)/libs/gamecode/builtins/libQFgamecode_builtins.la
 console_client_la_SOURCES=	$(client_sources)
 
 console_server_la_LDFLAGS=	$(plugin_ldflags)
-console_server_la_LIBADD=	$(CURSES_LIBS) $(plugin_libadd)
+console_server_la_LIBADD=	$(CURSES_LIBS) $(plugin_libadd) libQFconsole.la
 console_server_la_SOURCES=	$(server_sources)