diff --git a/engine/wscript b/engine/wscript
index e7e16ff9..80469e77 100644
--- a/engine/wscript
+++ b/engine/wscript
@@ -141,7 +141,7 @@ def build(bld):
 	bld(name = 'engine_includes', export_includes = '. common common/imagelib', use = 'filesystem_includes')
 
 	is_cxx_link = False
-	libs = [ 'engine_includes', 'public', 'dllemu', 'werror' ]
+	libs = [ 'engine_includes', 'public', 'dllemu', 'werror', 'opus', 'libvorbisfile', 'libopusfile' ]
 
 	# basic build: dedicated only
 	source = bld.path.ant_glob([
@@ -236,7 +236,7 @@ def build(bld):
 			'client/vgui/*.c',
 			'client/avi/*.c'])
 		is_cxx_link = True
-		libs += ['opus', 'libvorbisfile', 'libopusfile', 'bzip2', 'MultiEmulator']
+		libs += ['bzip2', 'MultiEmulator']
 
 	rpath = bld.env.DEFAULT_RPATH
 
diff --git a/wscript b/wscript
index 206ae14b..53098429 100644
--- a/wscript
+++ b/wscript
@@ -84,7 +84,11 @@ SUBDIRS = [
 	Subproject('filesystem'),
 	Subproject('stub/server'),
 	Subproject('dllemu'),
-
+    Subproject('3rdparty/libogg'),
+    Subproject('3rdparty/vorbis/libvorbis'),
+    Subproject('3rdparty/vorbis/libvorbisfile'),
+    Subproject('3rdparty/opusfile'),
+    
 	# disable only by engine feature, makes no sense to even parse subprojects in dedicated mode
 	Subproject('3rdparty/extras',       lambda x: not x.env.DEDICATED and x.env.DEST_OS != 'android'),
 	Subproject('3rdparty/nanogl',       lambda x: not x.env.DEDICATED and x.env.NANOGL),
@@ -96,10 +100,6 @@ SUBDIRS = [
 	Subproject('3rdparty/bzip2',        lambda x: not x.env.DEDICATED and not x.env.HAVE_SYSTEM_BZ2),
 	Subproject('3rdparty/mainui',       lambda x: not x.env.DEDICATED),
 	Subproject('3rdparty/vgui_support', lambda x: not x.env.DEDICATED),
-	Subproject('3rdparty/libogg', 		lambda x: not x.env.DEDICATED),
-    Subproject('3rdparty/vorbis/libvorbis', lambda x: not x.env.DEDICATED),
-    Subproject('3rdparty/vorbis/libvorbisfile', lambda x: not x.env.DEDICATED),
-    Subproject('3rdparty/opusfile',		lambda x: not x.env.DEDICATED),
 	Subproject('3rdparty/MultiEmulator',lambda x: not x.env.DEDICATED),
 #	Subproject('3rdparty/freevgui',     lambda x: not x.env.DEDICATED),
 	Subproject('stub/client',           lambda x: not x.env.DEDICATED),
@@ -107,7 +107,7 @@ SUBDIRS = [
 	Subproject('engine'), # keep latest for static linking
 
 	# disable only by external dependency presense
-	Subproject('3rdparty/opus', lambda x: not x.env.HAVE_SYSTEM_OPUS and not x.env.DEDICATED),
+	Subproject('3rdparty/opus', lambda x: not x.env.HAVE_SYSTEM_OPUS),
 
 	# enabled optionally
 	Subproject('utils/mdldec',     lambda x: x.env.ENABLE_UTILS),