diff --git a/RPM/quakeforge.spec.in b/RPM/quakeforge.spec.in
index 246428b19..98037b27e 100644
--- a/RPM/quakeforge.spec.in
+++ b/RPM/quakeforge.spec.in
@@ -15,6 +15,8 @@
 %define BUILD_GL    '@CAN_BUILD_GL@'
 %define BUILD_SW    '@CAN_BUILD_SW@'
 
+%define fs_sharepath %{_prefix}/share/games/quakeforge
+
 Name:		%{name}
 Version:	%{version}
 Release:	%{release}
@@ -328,9 +330,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %doc COPYING INSTALL TODO doc/*
-%attr(-,root,root) %dir	%{_prefix}/share/games/quakeforge
-%attr(-,root,root) %dir	%{_prefix}/share/games/quakeforge/id1
-%attr(-,root,root) %{_prefix}/share/games/quakeforge/id1/menu.dat*
+%attr(-,root,root) %dir	%{fs_sharepath}
+%attr(-,root,root) %dir	%{fs_sharepath}/id1
+%attr(-,root,root) %{fs_sharepath}/id1/menu.dat*
 
 %files common
 %attr(-,root,root) /etc/quakeforge.conf
@@ -343,10 +345,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(-,root,root) %{_prefix}/lib/libQFmodels.so.*
 %attr(-,root,root) %{_prefix}/lib/libQFsound.so.*
 %attr(-,root,root) %{_prefix}/lib/libQFutil.so.*
-%attr(-,root,root) %{_prefix}/lib/quakeforge/libcd_null.so*
-%attr(-,root,root) %{_prefix}/lib/quakeforge/libconsole_client.so*
-%attr(-,root,root) %{_prefix}/lib/quakeforge/libsnd_output_disk.so*
-%attr(-,root,root) %{_prefix}/lib/quakeforge/libsnd_render_default.so*
+%attr(-,root,root) %{fs_sharepath}/QFplugins/cd_null.so*
+%attr(-,root,root) %{fs_sharepath}/QFplugins/console_client.so*
+%attr(-,root,root) %{fs_sharepath}/QFplugins/snd_output_disk.so*
+%attr(-,root,root) %{fs_sharepath}/QFplugins/snd_render_default.so*
 
 %files utils
 %attr(-,root,root)	%{_prefix}/bin/pak
@@ -359,30 +361,30 @@ rm -rf $RPM_BUILD_ROOT
 %files stub
 
 %post stub
-if test -f %{_prefix}/share/games/quakeforge/id1/pak0.pak; then
+if test -f %{fs_sharepath}/id1/pak0.pak; then
 else
-	echo Warning: %{_prefix}/share/games/quakeforge/id1/pak0.pak not found
+	echo Warning: %{fs_sharepath}/id1/pak0.pak not found
 	echo Install either the shareware or registered quake data in
-	echo %{_prefix}/share/games/quakeforge
+	echo %{fs_sharepath}
 fi
 
 %files servers
 %attr(-,root,root)	%{_prefix}/bin/qw-server
 %attr(-,root,root)	%{_prefix}/bin/nq-server
 %attr(-,root,root)	%{_prefix}/bin/qw-master
-%attr(-,root,root)	%{_prefix}/lib/quakeforge/libconsole_server.so*
+%attr(-,root,root)	%{fs_sharepath}/QFplugins/console_server.so*
 
 %files cd-linux
-%attr(-,root,root) %{_prefix}/lib/quakeforge/libcd_linux.so*
+%attr(-,root,root) %{fs_sharepath}/QFplugins/cd_linux.so*
 
 %if "%{HAVE_SDL}"=="'yes'"
 %files cd-sdl
-%attr(-,root,root) %{_prefix}/lib/quakeforge/libcd_sdl.so*
+%attr(-,root,root) %{fs_sharepath}/QFplugins/cd_sdl.so*
 %endif
 
 %if "%{HAVE_XMMS}"=="'yes'"
 %files cd-xmms
-%attr(-,root,root) %{_prefix}/lib/quakeforge/libcd_xmms.so*
+%attr(-,root,root) %{fs_sharepath}/QFplugins/cd_xmms.so*
 %endif
 
 %if "%{HAVE_FBDEV}"=="'yes'"
@@ -425,17 +427,17 @@ fi
 
 %if "%{HAVE_ALSA}"=="'yes'"
 %files snd-alsa
-%attr(-,root,root)	%{_prefix}/lib/quakeforge/libsnd_output_alsa0_9.so*
+%attr(-,root,root)	%{fs_sharepath}/QFplugins/snd_output_alsa0_9.so*
 %endif
 
 %if "%{HAVE_OSS}"=="'yes'"
 %files snd-oss
-%attr(-,root,root)	%{_prefix}/lib/quakeforge/libsnd_output_oss.so*
+%attr(-,root,root)	%{fs_sharepath}/QFplugins/snd_output_oss.so*
 %endif
 
 %if "%{HAVE_SDL}"=="'yes'"
 %files snd-sdl
-%attr(-,root,root)	%{_prefix}/lib/quakeforge/libsnd_output_sdl.so*
+%attr(-,root,root)	%{fs_sharepath}/QFplugins/snd_output_sdl.so*
 %endif
 
 %if "%{BUILD_GL}"=="'yes'"
diff --git a/bootstrap b/bootstrap
index 57cd3c0ef..4bfacec82 100755
--- a/bootstrap
+++ b/bootstrap
@@ -8,10 +8,18 @@ if test -n "$lt" ; then
 		LTIZE_VER_MAJOR=`echo $LTIZE_VER | cut -f1 -d'.'`
 		LTIZE_VER_MINOR=`echo $LTIZE_VER | cut -f2 -d'.'`
 
-		if test "$LTIZE_VER_MAJOR" -lt "2" -a "$LTIZE_VER_MINOR" -lt "4" ; then
-			WOODY_FIX="yes";
+		if test "$LTIZE_VER_MAJOR" -lt "1"; then
+			echo "Libtool 1.4 or greater needed to build configure."
+			exit 1
+		fi
+		if test "$LTIZE_VER_MAJOR" -eq "1" -a "$LTIZE_VER_MINOR" -lt "4" ; then
+			echo "Libtool 1.4 or greater needed to build configure."
+			exit 1
 		fi
 	fi
+else
+	echo Libtool not found. QuakeForge CVS requires libtool to bootstrap itself.
+	exit 1
 fi
 
 # Check Autoconf version
@@ -23,31 +31,38 @@ if test -n "$ac" ; then
 		AC_VER_MINOR=`echo $AC_VER | cut -f2 -d'.' | sed 's/[^0-9]*$//'`
 
 		if test "$AC_VER_MAJOR" -lt "2" ; then
-			echo "Autoconf 2.13 or greater needed to build configure."
+			echo "Autoconf 2.52 or greater needed to build configure."
 			exit 1
 		fi
 
-		if test "$AC_VER_MINOR" -lt "13" ; then
-			echo "Autoconf 2.13 or greater needed to build configure."
+		if test "$AC_VER_MAJOR" -eq "2" -a "$AC_VER_MINOR" -lt "52" ; then
+			echo "Autoconf 2.52 or greater needed to build configure."
 			exit 1
 		fi
-
-		if test "$AC_VER_MINOR" -lt "50" ; then
-			if test ! -f configure.in ; then
-				ln -s configure.ac configure.in
-			fi
-			echo "If you see some warnings about cross-compiling, don't worry; this is normal."
-		elif test "$WOODY_FIX" = "yes" ; then
-			if test ! -f configure.in ; then
-				ln -s configure.ac configure.in
-			fi
-		else
-			rm -f configure.in
-		fi
 	fi
 else
 	echo Autoconf not found. QuakeForge CVS requires autoconf to bootstrap itself.
 	exit 1
 fi
 
+am=`which automake`
+if test -n "$am" ; then
+	if test -x "$am" ; then
+		AM_VER=`automake --version |head| sed 's/automake (GNU automake) //'`
+		AM_VER_MAJOR=`echo $AM_VER | cut -f1 -d.`
+		AM_VER_MINOR=`echo $AM_VER | cut -f2 -d.`
+		if test "$AM_VER_MAJOR" -lt "1"; then
+			echo "Need automake version 1.6 or higher"
+			exit 1
+		fi
+		if test "$AM_VER_MAJOR" -eq "1" -a "$AM_VER_MINOR" -lt "6"; then
+			echo "Need automake version 1.6 or higher"
+			exit 1
+		fi
+	fi
+else
+	echo Automake not found. QuakeForge CVS requires automake to bootstrap itself.
+	exit 1
+fi
+
 aclocal && autoheader && libtoolize --automake && automake --add-missing && autoconf
diff --git a/configure.ac b/configure.ac
index 611f8ddd7..08a42fc7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -926,7 +926,7 @@ dnl Checks for CD-ROM
 dnl ==================================================================
 
 CD_CFLAGS=""
-CD_PLUGIN_TARGETS="libcd_null.la"
+CD_PLUGIN_TARGETS="cd_null.la"
 unset CDTYPE
 
 AC_MSG_CHECKING(for CD audio support)
@@ -940,20 +940,20 @@ QF_maGiC_VALUE
 #endif
 	],
 	CDTYPE="$CDTYPE Linux"
-	CD_PLUGIN_TARGETS="$CD_PLUGIN_TARGETS libcd_linux.la"
+	CD_PLUGIN_TARGETS="$CD_PLUGIN_TARGETS cd_linux.la"
 )
 
 dnl XMMS audio
 if test "x$HAVE_XMMS" = "xyes"; then
 	CDTYPE="$CDTYPE XMMS"
-	CD_PLUGIN_TARGETS="$CD_PLUGIN_TARGETS libcd_xmms.la"
+	CD_PLUGIN_TARGETS="$CD_PLUGIN_TARGETS cd_xmms.la"
 	AC_DEFINE(HAVE_XMMS, [1], [Define if you have XMMS])
 fi
 
 dnl SDL CD audio
 if test "x$HAVE_SDL" = "xyes"; then
 	CDTYPE="$CDTYPE SDL"
-	CD_PLUGIN_TARGETS="$CD_PLUGIN_TARGETS libcd_sdl.la"
+	CD_PLUGIN_TARGETS="$CD_PLUGIN_TARGETS cd_sdl.la"
 fi
 
 dnl SGI
@@ -965,7 +965,7 @@ QF_maGiC_VALUE
 #endif
 	],
 	CDTYPE="$CDTYPE SGI"
-	CD_PLUGIN_TARGETS="$CD_PLUGIN_TARGETS libcd_sgi.la"
+	CD_PLUGIN_TARGETS="$CD_PLUGIN_TARGETS cd_sgi.la"
 	SGI_CD_LIBS="-lcdaudio -lmediad -lds"
 )
 AC_SUBST(SGI_CD_LIBS)
@@ -979,7 +979,7 @@ QF_maGiC_VALUE
 #endif
 	],
 	CDTYPE="$CDTYPE WIN32"
-	CD_PLUGIN_TARGETS="$CD_PLUGIN_TARGETS libcd_win.la"
+	CD_PLUGIN_TARGETS="$CD_PLUGIN_TARGETS cd_win.la"
 )
 if test "$CDTYPE"; then
 	AC_MSG_RESULT([$CDTYPE])
@@ -1128,10 +1128,10 @@ AC_DEFINE_UNQUOTED(FS_USERPATH, "$userpath", [Define this to the unshared game d
 
 AC_ARG_WITH(plugin-path,
 [  --with-plugin-path=DIR  Use DIR for loading plugins, defaults to
-                          \${libdir}/quakeforge],
+                          \${sharepath}/QFplugins],
 plugindir=$withval, plugindir="auto")
 
-PLUGINDIR="\${libdir}/$PACKAGE"
+PLUGINDIR="\${sharepath}/QFplugins"
 if test "x$plugindir" = "xauto" -o "x$plugindir" = "xyes" -o "x$plugindir" = "x"; then
 	plugindir="$PLUGINDIR"
 elif test "x$plugindir" = xno; then
@@ -1545,7 +1545,7 @@ CAN_BUILD_SW32=no
 CAN_BUILD_SW=no
 
 CD_TARGETS=""
-SND_PLUGIN_TARGETS="libsnd_output_disk.la"
+SND_PLUGIN_TARGETS="snd_output_disk.la"
 SND_REND_TARGETS=""
 SND_TARGETS=""
 VID_MODEL_TARGETS=""
@@ -1553,6 +1553,15 @@ VID_REND_TARGETS=""
 VID_REND_NOINST_TARGETS=""
 VID_TARGETS=""
 
+vid_need_asm=no
+vid_need_common=no
+vid_need_gl=no
+vid_need_sdl=no
+vid_need_sw=no
+vid_need_sw32=no
+vid_need_svgas=no
+vid_need_x11=no
+
 if test "x$HAVE_FBDEV" = xyes; then
 	if test "x$ENABLE_FBDEV" = xyes; then
 		QW_TARGETS="$QW_TARGETS qw-client-fbdev\$(EXEEXT)"
@@ -1560,6 +1569,8 @@ if test "x$HAVE_FBDEV" = xyes; then
 		CL_TARGETS="$CL_TARGETS FBDEV"
 		VID_TARGETS="$VID_TARGETS libQFfbdev.la"
 		BUILD_SW=yes
+		vid_need_common=yes
+		vid_need_sw=yes
 	fi
 	CAN_BUILD_SW=yes
 fi
@@ -1572,6 +1583,9 @@ if test "x$HAVE_X" = xyes; then
 		CL_TARGETS="$CL_TARGETS GLX"
 		VID_TARGETS="$VID_TARGETS libQFglx.la"
 		BUILD_GL=yes
+		vid_need_common=yes
+		vid_need_gl=yes
+		vid_need_x11=yes
 	fi
 	if test "x$ENABLE_X11" = xyes; then
 		QW_TARGETS="$QW_TARGETS qw-client-x11\$(EXEEXT)"
@@ -1579,6 +1593,9 @@ if test "x$HAVE_X" = xyes; then
 		CL_TARGETS="$CL_TARGETS X11"
 		VID_TARGETS="$VID_TARGETS libQFx11.la"
 		BUILD_SW=yes
+		vid_need_common=yes
+		vid_need_sw=yes
+		vid_need_x11=yes
 	fi
 fi
 if test "x$HAVE_MGL" = xyes; then
@@ -1588,6 +1605,8 @@ if test "x$HAVE_MGL" = xyes; then
 		CL_TARGETS="$CL_TARGETS MGL"
 		VID_TARGETS="$VID_TARGETS libQFwgl.la"
 		BUILD_SW=yes
+		vid_need_common=yes
+		vid_need_sw=yes
 	fi
 	CAN_BUILD_SW=yes
 fi
@@ -1598,6 +1617,9 @@ if test "x$HAVE_SDL" = xyes; then
 		CL_TARGETS="$CL_TARGETS SDL"
 		VID_TARGETS="$VID_TARGETS libQFsdl.la"
 		BUILD_SW=yes
+		vid_need_common=yes
+		vid_need_sdl=yes
+		vid_need_sw=yes
 	fi
 	CAN_BUILD_SW=yes
 	if test "x$ENABLE_SDL32" = xyes; then
@@ -1606,6 +1628,9 @@ if test "x$HAVE_SDL" = xyes; then
 		CL_TARGETS="$CL_TARGETS SDL32"
 		VID_TARGETS="$VID_TARGETS libQFsdl32.la"
 		BUILD_SW32=yes
+		vid_need_common=yes
+		vid_need_sdl=yes
+		vid_need_sw32=yes
 	fi
 	CAN_BUILD_SW32=yes
 	if test "x$ENABLE_SGL" = xyes; then
@@ -1614,6 +1639,9 @@ if test "x$HAVE_SDL" = xyes; then
 		CL_TARGETS="$CL_TARGETS SDL-GL"
 		VID_TARGETS="$VID_TARGETS libQFsgl.la"
 		BUILD_GL=yes
+		vid_need_common=yes
+		vid_need_gl=yes
+		vid_need_sdl=yes
 		CAN_BUILD_GL=yes
 	fi
 fi
@@ -1624,6 +1652,10 @@ if test "x$HAVE_SVGA" = xyes; then
 		CL_TARGETS="$CL_TARGETS SVGAlib"
 		VID_TARGETS="$VID_TARGETS libQFsvga.la"
 		BUILD_SW=yes
+		vid_need_asm=yes
+		vid_need_common=yes
+		vid_need_sw=yes
+		vid_need_svga=yes
 	fi
 	CAN_BUILD_SW=yes
 	if test "x$ENABLE_3DFX" = xyes; then
@@ -1632,6 +1664,10 @@ if test "x$HAVE_SVGA" = xyes; then
 		CL_TARGETS="$CL_TARGETS 3dfx"
 		VID_TARGETS="$VID_TARGETS libQFtdfx.la"
 		BUILD_GL=yes
+		vid_need_asm=yes
+		vid_need_common=yes
+		vid_need_gl=yes
+		vid_need_svga=yes
 	fi
 	CAN_BUILD_GL=yes
 fi
@@ -1642,10 +1678,44 @@ if test "x$mingw" = xyes; then
 		CL_TARGETS="$CL_TARGETS WGL"
 		VID_TARGETS="$VID_TARGETS libQFwgl.la"
 		BUILD_GL=yes
+		vid_need_common=yes
+		vid_need_gl=yes
 	fi
 	CAN_BUILD_GL=yes
 fi
 
+if test "$vid_need_x11" = yes; then
+	VID_TARGETS="$VID_TARGETS libx11.la"
+fi
+
+if test "$vid_need_svga" = yes; then
+	VID_TARGETS="$VID_TARGETS libsvga.la"
+fi
+
+if test "$vid_need_sw32" = yes; then
+	VID_TARGETS="$VID_TARGETS libsw32.la"
+fi
+
+if test "$vid_need_sw" = yes; then
+	VID_TARGETS="$VID_TARGETS libsw.la"
+fi
+
+if test "$vid_need_sdl" = yes; then
+	VID_TARGETS="$VID_TARGETS libsdl.la"
+fi
+
+if test "$vid_need_gl" = yes; then
+	VID_TARGETS="$VID_TARGETS libgl.la"
+fi
+
+if test "$vid_need_common" = yes; then
+	VID_TARGETS="$VID_TARGETS libcommon.la"
+fi
+
+if test "$vid_need_asm" = yes; then
+	VID_TARGETS="$VID_TARGETS libasm.la"
+fi
+
 unset SV_TARGETS
 if test "x$ENABLE_NQ_SERVER" = xyes; then
 	NQ_TARGETS="nq-server\$(EXEEXT) $NQ_TARGETS"
@@ -1689,31 +1759,31 @@ if test -n "$CL_TARGETS"; then
 	SND_TARGETS="libQFsound.la"
 	JOY_TARGETS="libQFjs.la"
 	if test "`echo $SOUND_TYPES | grep ALSA0.5`"; then
-		SND_PLUGIN_TARGETS="$SND_PLUGIN_TARGETS libsnd_output_alsa0_5.la"
+		SND_PLUGIN_TARGETS="$SND_PLUGIN_TARGETS snd_output_alsa0_5.la"
 	fi
 	if test "`echo $SOUND_TYPES | grep ALSA0.9`"; then
-		SND_PLUGIN_TARGETS="$SND_PLUGIN_TARGETS libsnd_output_alsa0_9.la"
+		SND_PLUGIN_TARGETS="$SND_PLUGIN_TARGETS snd_output_alsa0_9.la"
 	fi
 	if test "`echo $SOUND_TYPES | grep MME`"; then
-		SND_PLUGIN_TARGETS="$SND_PLUGIN_TARGETS libsnd_output_mme.la"
+		SND_PLUGIN_TARGETS="$SND_PLUGIN_TARGETS snd_output_mme.la"
 	fi
 	if test "`echo $SOUND_TYPES | grep OSS`"; then
-		SND_PLUGIN_TARGETS="$SND_PLUGIN_TARGETS libsnd_output_oss.la"
+		SND_PLUGIN_TARGETS="$SND_PLUGIN_TARGETS snd_output_oss.la"
 	fi
 	if test "`echo $SOUND_TYPES | grep SDL`"; then
-		SND_PLUGIN_TARGETS="$SND_PLUGIN_TARGETS libsnd_output_sdl.la"
+		SND_PLUGIN_TARGETS="$SND_PLUGIN_TARGETS snd_output_sdl.la"
 	fi
 	if test "`echo $SOUND_TYPES | grep SGI`"; then
-		SND_PLUGIN_TARGETS="$SND_PLUGIN_TARGETS libsnd_output_sgi.la"
+		SND_PLUGIN_TARGETS="$SND_PLUGIN_TARGETS snd_output_sgi.la"
 	fi
 	if test "`echo $SOUND_TYPES | grep SUN`"; then
-		SND_PLUGIN_TARGETS="$SND_PLUGIN_TARGETS libsnd_output_sun.la"
+		SND_PLUGIN_TARGETS="$SND_PLUGIN_TARGETS snd_output_sun.la"
 	fi
 	if test "`echo $SOUND_TYPES | grep Win32`"; then
-		SND_PLUGIN_TARGETS="$SND_PLUGIN_TARGETS libsnd_output_win.la"
+		SND_PLUGIN_TARGETS="$SND_PLUGIN_TARGETS snd_output_win.la"
 	fi
 	if test "$SOUND_TYPES"; then
-		SND_REND_TARGETS="$SND_REND_TARGETS libsnd_render_default.la"
+		SND_REND_TARGETS="$SND_REND_TARGETS snd_render_default.la"
 	fi
 else
 	unset CDTYPE
@@ -1726,19 +1796,31 @@ else
 	unset SOUND_TYPES
 fi
 
-SERVER_PLUGIN_TARGETS="libconsole_server.la"
+SERVER_PLUGIN_TARGETS="console_server.la"
 SERVER_PLUGIN_STATIC=""
-CLIENT_PLUGIN_TARGETS="libconsole_client.la"
+CLIENT_PLUGIN_TARGETS="console_client.la"
 CLIENT_PLUGIN_STATIC=""
 CD_PLUGIN_STATIC=""
 SND_PLUGIN_STATIC=""
 SND_REND_STATIC=""
 
+if test "$enable_shared" = no; then
+	PREFER_PIC=
+	PREFER_NON_PIC=
+else
+	PREFER_PIC=-prefer-pic
+	PREFER_NON_PIC=-prefer-non-pic
+fi
+AC_SUBST(PREFER_PIC)
+AC_SUBST(PREFER_NON_PIC)
+
 AC_ARG_WITH(static-plugins,
 [  --with-static-plugins   build plugins into executable rather than separate],
 	static_plugins="$withval", static_plugins=auto)
-if test "x$static_plugins" = xauto -a "x$SYSTYPE" = xWIN32; then
-	static_plugins=yes
+if test "x$static_plugins" = xauto; then
+	if test "$enable_shared" = no -o "x$SYSTYPE" = xWIN32; then
+		static_plugins=yes
+	fi
 fi
 if test "x$static_plugins" = xyes; then
 	AC_DEFINE(STATIC_PLUGINS, 1, [Define this if you are building static plugins])
@@ -1756,9 +1838,11 @@ if test "x$static_plugins" = xyes; then
 		SOUND_TYPES="$SOUND_TYPES (static)"
 		CDTYPE="$CDTYPE (static)"
 	fi
+	plugin_ldflags="$plugin_ldflags"
 else
 	plugin_ldflags="$plugin_ldflags"' -version-info $(plugin_version) -rpath $(plugindir)'
 fi
+plugin_ldflags="$plugin_ldflags -module -avoid-version"
 SERVER_PLUGIN_STATIC_LIBS=""
 CLIENT_PLUGIN_STATIC_LIBS=""
 CD_PLUGIN_STATIC_LIBS=""
@@ -1776,31 +1860,31 @@ SND_OUTPUT_PROTOS=""
 SND_RENDER_PROTOS=""
 for l in $SERVER_PLUGIN_STATIC; do
 	SERVER_PLUGIN_STATIC_LIBS="$SERVER_PLUGIN_STATIC_LIBS "'$(top_builddir)'"/libs/console/$l"
-	n="`echo $l | sed -e 's/.*lib\(.*\)\.la/\1/'`"
+	n="`echo $l | sed -e 's/\(.*\)\.la/\1/'`"
 	SERVER_PLUGIN_LIST='{"'"$n"'"'", ${n}_PluginInfo},$SERVER_PLUGIN_LIST"
 	SERVER_PLUGIN_PROTOS="$SERVER_PLUGIN_PROTOS extern QFPLUGIN plugin_t *${n}_PluginInfo (void);"
 done
 for l in $CLIENT_PLUGIN_STATIC; do
 	CLIENT_PLUGIN_STATIC_LIBS="$CLIENT_PLUGIN_STATIC_LIBS "'$(top_builddir)'"/libs/console/$l"
-	n="`echo $l | sed -e 's/.*lib\(.*\)\.la/\1/'`"
+	n="`echo $l | sed -e 's/\(.*\)\.la/\1/'`"
 	CLIENT_PLUGIN_LIST='{"'"$n"'"'", ${n}_PluginInfo},$CLIENT_PLUGIN_LIST"
 	CLIENT_PLUGIN_PROTOS="$CLIENT_PLUGIN_PROTOS extern QFPLUGIN plugin_t *${n}_PluginInfo (void);"
 done
 for l in $CD_PLUGIN_STATIC; do
 	CD_PLUGIN_STATIC_LIBS="$CD_PLUGIN_STATIC_LIBS cd/$l"
-	n="`echo $l | sed -e 's/lib\(.*\)\.la/\1/'`"
+	n="`echo $l | sed -e 's/\(.*\)\.la/\1/'`"
 	CD_PLUGIN_LIST='{"'"$n"'"'", ${n}_PluginInfo},$CD_PLUGIN_LIST"
 	CD_PLUGIN_PROTOS="$CD_PLUGIN_PROTOS extern QFPLUGIN plugin_t *${n}_PluginInfo (void);"
 done
 for l in $SND_PLUGIN_STATIC; do
 	SND_PLUGIN_STATIC_LIBS="$SND_PLUGIN_STATIC_LIBS targets/$l"
-	n="`echo $l | sed -e 's/lib\(.*\)\.la/\1/'`"
+	n="`echo $l | sed -e 's/\(.*\)\.la/\1/'`"
 	SND_OUTPUT_LIST='{"'"$n"'"'", ${n}_PluginInfo},$SND_OUTPUT_LIST"
 	SND_OUTPUT_PROTOS="$SND_OUTPUT_PROTOS extern QFPLUGIN plugin_t *${n}_PluginInfo (void);"
 done
 for l in $SND_REND_STATIC; do
 	SND_REND_STATIC_LIBS="$SND_REND_STATIC_LIBS renderer/$l"
-	n="`echo $l | sed -e 's/lib\(.*\)\.la/\1/'`"
+	n="`echo $l | sed -e 's/\(.*\)\.la/\1/'`"
 	SND_RENDER_LIST='{"'"$n"'"'", ${n}_PluginInfo},$SND_RENDER_LIST"
 	SND_RENDER_PROTOS="$SND_RENDER_PROTOS extern QFPLUGIN plugin_t *${n}_PluginInfo (void);"
 done
diff --git a/debian/quakeforge-alsa.postinst b/debian/quakeforge-alsa.postinst
index 195b72bba..892138e7f 100644
--- a/debian/quakeforge-alsa.postinst
+++ b/debian/quakeforge-alsa.postinst
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-update-alternatives --install /usr/lib/quakeforge/libsnd_output_default.so quakeforge-audio-default /usr/lib/quakeforge/libsnd_output_alsa0_9.so 100
+update-alternatives --install /usr/share/games/quake/QFplugins/snd_output_default.so quakeforge-audio-default /usr/share/games/quake/QFplugins/snd_output_alsa0_9.so 100
 
 #DEBHELPER#
 
diff --git a/debian/quakeforge-alsa.prerm b/debian/quakeforge-alsa.prerm
index 718c7d0e5..1e3dc8240 100644
--- a/debian/quakeforge-alsa.prerm
+++ b/debian/quakeforge-alsa.prerm
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-update-alternatives --remove quakeforge-audio-default /usr/lib/quakeforge/libsnd_output_alsa0_9.so
+update-alternatives --remove quakeforge-audio-default /usr/share/games/quake/QFplugins/snd_output_alsa0_9.so
 
 #DEBHELPER#
 
diff --git a/debian/quakeforge-common.postinst b/debian/quakeforge-common.postinst
index 4e703af9d..10bbcda3f 100644
--- a/debian/quakeforge-common.postinst
+++ b/debian/quakeforge-common.postinst
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
-update-alternatives --install /usr/lib/quakeforge/libsnd_output_default.so quakeforge-audio-default /usr/lib/quakeforge/libsnd_output_disk.so 10
-update-alternatives --install /usr/lib/quakeforge/libsnd_output_default.so quakeforge-audio-default /usr/lib/quakeforge/libsnd_output_null.so 20
+update-alternatives --install /usr/share/games/quake/QFplugins/snd_output_default.so quakeforge-audio-default /usr/share/games/quake/QFplugins/snd_output_disk.so 10
+update-alternatives --install /usr/share/games/quake/QFplugins/snd_output_default.so quakeforge-audio-default /usr/share/games/quake/QFplugins/snd_output_null.so 20
 
 if [ "$1" = "configure" ]; then
   ldconfig
diff --git a/debian/quakeforge-oss.postinst b/debian/quakeforge-oss.postinst
index 8b4679e97..e982da28d 100644
--- a/debian/quakeforge-oss.postinst
+++ b/debian/quakeforge-oss.postinst
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-update-alternatives --install /usr/lib/quakeforge/libsnd_output_default.so quakeforge-audio-default /usr/lib/quakeforge/libsnd_output_oss.so 90
+update-alternatives --install /usr/share/games/quake/QFplugins/snd_output_default.so quakeforge-audio-default /usr/share/games/quake/QFplugins/snd_output_oss.so 90
 
 #DEBHELPER#
 
diff --git a/debian/quakeforge-oss.prerm b/debian/quakeforge-oss.prerm
index 093ce6fd3..5dceab4ca 100644
--- a/debian/quakeforge-oss.prerm
+++ b/debian/quakeforge-oss.prerm
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-update-alternatives --remove quakeforge-audio-default /usr/lib/quakeforge/libsnd_output_oss.so
+update-alternatives --remove quakeforge-audio-default /usr/share/games/quake/QFplugins/snd_output_oss.so
 
 #DEBHELPER#
 
diff --git a/debian/rules b/debian/rules
index 27295e9c7..70b5cecb5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -94,11 +94,11 @@ install: build
 		usr/lib/libQFmodels.so.* \
 		usr/lib/libQFsound.so.* \
 		usr/lib/libQFutil.so.* \
-		usr/lib/quakeforge/libcd_null.so* \
-		usr/lib/quakeforge/libconsole_client.so* \
-		usr/lib/quakeforge/libsnd_output_disk.so* \
-		usr/lib/quakeforge/libsnd_output_null.so* \
-		usr/lib/quakeforge/libsnd_render_default.so*
+		usr/share/games/quake/QFplugins/cd_null.so* \
+		usr/share/games/quake/QFplugins/console_client.so* \
+		usr/share/games/quake/QFplugins/snd_output_disk.so* \
+		usr/share/games/quake/QFplugins/snd_output_null.so* \
+		usr/share/games/quake/QFplugins/snd_render_default.so*
 	dh_installdocs -p$(common) NEWS TODO
 	dh_installchangelogs -p$(common) ChangeLog
 
@@ -148,7 +148,7 @@ install: build
 		usr/games/qw-master \
 		usr/games/qw-server \
 		usr/games/nq-server \
-		usr/lib/quakeforge/libconsole_server.so*
+		usr/share/games/quake/QFplugins/console_server.so*
 	install -d -m755 debian/$(servers)/usr/share/doc
 	ln -s $(common) debian/$(servers)/usr/share/doc/$(servers)
 
@@ -189,13 +189,13 @@ install: build
 
 	# quakeforge-alsa
 	dh_movefiles -p$(alsa) --sourcedir=$(tmp) \
-		usr/lib/quakeforge/libsnd_output_alsa0_9.so*
+		usr/share/games/quake/QFplugins/snd_output_alsa0_9.so*
 	install -d -m755 debian/$(alsa)/usr/share/doc
 	ln -s $(common) debian/$(alsa)/usr/share/doc/$(alsa)
 
 	# quakeforge-oss
 	dh_movefiles -p$(oss) --sourcedir=$(tmp) \
-		usr/lib/quakeforge/libsnd_output_oss.so*
+		usr/share/games/quake/QFplugins/snd_output_oss.so*
 	install -d -m755 debian/$(oss)/usr/share/doc
 	ln -s $(common) debian/$(oss)/usr/share/doc/$(oss)
 
diff --git a/libs/audio/Makefile.am b/libs/audio/Makefile.am
index 5131326f1..2cd851256 100644
--- a/libs/audio/Makefile.am
+++ b/libs/audio/Makefile.am
@@ -1,6 +1,7 @@
 AUTOMAKE_OPTIONS= foreign
 
 SUBDIRS=cd targets renderer 
+AM_CFLAGS= @PREFER_PIC@
 INCLUDES=-I$(top_srcdir)/include
 
 lib_LTLIBRARIES=	@CD_TARGETS@ @SND_TARGETS@
diff --git a/libs/audio/cd/Makefile.am b/libs/audio/cd/Makefile.am
index f5b7af6c0..a394b610a 100644
--- a/libs/audio/cd/Makefile.am
+++ b/libs/audio/cd/Makefile.am
@@ -1,35 +1,39 @@
 AUTOMAKE_OPTIONS= foreign
 
-INCLUDES= -I$(top_srcdir)/include $(SDL_CFLAGS) $(XMMS_CFLAGS)
+AM_CFLAGS= @PREFER_PIC@
+INCLUDES= -I$(top_srcdir)/include
 SDL_LIBS= @SDL_LIBS@
 XMMS_LIBS= @XMMS_LIBS@
 plugin_version= 1:0:0
 plugin_ldflags= @plugin_ldflags@
 plugin_libadd= @plugin_libadd@
+EXEEXT=
 
-plugin_LTLIBRARIES=	@CD_PLUGIN_TARGETS@
-noinst_LTLIBRARIES=	@CD_PLUGIN_STATIC@
-EXTRA_LTLIBRARIES=	libcd_linux.la libcd_sdl.la libcd_sgi.la libcd_win.la libcd_null.la libcd_xmms.la
+plugin_PROGRAMS=	@CD_PLUGIN_TARGETS@
+noinst_PROGRAMS=	@CD_PLUGIN_STATIC@
+EXTRA_PROGRAMS=	cd_linux.la cd_sdl.la cd_sgi.la cd_win.la cd_null.la cd_xmms.la
 
-libcd_linux_la_LDFLAGS=	$(plugin_ldflags)
-libcd_linux_la_SOURCES=	cd_linux.c
+cd_linux_la_LDFLAGS=	$(plugin_ldflags)
+cd_linux_la_SOURCES=	cd_linux.c
 
-libcd_xmms_la_LDFLAGS=	$(plugin_ldflags)
-libcd_xmms_la_LIBADD=	$(XMMS_LIBS)
-libcd_xmms_la_SOURCES=	cd_xmms.c
+cd_xmms_la_LDFLAGS=	$(plugin_ldflags)
+cd_xmms_la_LDADD=	$(XMMS_LIBS)
+cd_xmms_la_CFLAGS=	$(XMMS_CFLAGS)
+cd_xmms_la_SOURCES=	cd_xmms.c
 
-libcd_sdl_la_LDFLAGS=	$(plugin_ldflags)
-libcd_sdl_la_LIBADD=	$(SDL_LIBS) $(plugin_libadd)
-libcd_sdl_la_SOURCES=	cd_sdl.c
+cd_sdl_la_LDFLAGS=	$(plugin_ldflags)
+cd_sdl_la_LDADD=	$(SDL_LIBS) $(plugin_libadd)
+cd_sdl_la_CFLAGS=	$(SDL_CFLAGS)
+cd_sdl_la_SOURCES=	cd_sdl.c
 
-libcd_sgi_la_LDFLAGS=	$(plugin_ldflags)
-libcd_sgi_la_LIBADD=	$(SGI_CD_LIBS)
-libcd_sgi_la_SOURCES=	cd_sgi.c
+cd_sgi_la_LDFLAGS=	$(plugin_ldflags)
+cd_sgi_la_LDADD=	$(SGI_CD_LIBS)
+cd_sgi_la_SOURCES=	cd_sgi.c
 
-libcd_win_la_LDFLAGS=	$(plugin_ldflags)
-libcd_win_la_LIBADD=	$(plugin_libadd)
-libcd_win_la_SOURCES=	cd_win.c
+cd_win_la_LDFLAGS=	$(plugin_ldflags)
+cd_win_la_LDADD=	$(plugin_libadd)
+cd_win_la_SOURCES=	cd_win.c
 
-libcd_null_la_LDFLAGS=	$(plugin_ldflags)
-libcd_null_la_LIBADD=	$(plugin_libadd)
-libcd_null_la_SOURCES=	cd_null.c
+cd_null_la_LDFLAGS=	$(plugin_ldflags)
+cd_null_la_LDADD=	$(plugin_libadd)
+cd_null_la_SOURCES=	cd_null.c
diff --git a/libs/audio/renderer/Makefile.am b/libs/audio/renderer/Makefile.am
index 23db98434..ef3788e17 100644
--- a/libs/audio/renderer/Makefile.am
+++ b/libs/audio/renderer/Makefile.am
@@ -1,12 +1,14 @@
 AUTOMAKE_OPTIONS= foreign
 
+AM_CFLAGS= @PREFER_PIC@
 INCLUDES= -I$(top_srcdir)/include
 plugin_version= 1:0:0
 plugin_ldflags= @plugin_ldflags@
 plugin_libadd= @plugin_libadd@
+EXEEXT=
 
-plugin_LTLIBRARIES=	@SND_REND_TARGETS@
-EXTRA_LTLIBRARIES=	libsnd_render_default.la
+plugin_PROGRAMS=	@SND_REND_TARGETS@
+EXTRA_PROGRAMS=	snd_render_default.la
 
 if ASM_ARCH
 asm= libasm.la
@@ -14,18 +16,19 @@ else
 asm=
 endif
 
-noinst_LTLIBRARIES=	$(asm) @SND_REND_STATIC@
+noinst_LTLIBRARIES= $(asm)
+noinst_PROGRAMS=	@SND_REND_STATIC@
 
 libasm_la_SOURCES=	snd_mixa.S
 
-libsnd_render_default_la_LDFLAGS=	$(plugin_ldflags)
-libsnd_render_default_la_SOURCES=	snd_dma.c snd_mem.c snd_mix.c vorbis.c
+snd_render_default_la_LDFLAGS=	$(plugin_ldflags)
+snd_render_default_la_SOURCES=	snd_dma.c snd_mem.c snd_mix.c vorbis.c
 if ASM_ARCH
-libsnd_render_default_la_LIBADD=	$(asm) $(VORBISFILE_LIBS) $(VORBIS_LIBS) $(OGG_LIBS)
-libsnd_render_default_la_DEPENDENCIES=	$(asm)
+snd_render_default_la_LDADD=	$(asm) $(VORBISFILE_LIBS) $(VORBIS_LIBS) $(OGG_LIBS)
+snd_render_default_la_DEPENDENCIES=	$(asm)
 else
-libsnd_render_default_la_LIBADD=	$(VORBISFILE_LIBS) $(VORBIS_LIBS) $(OGG_LIBS)
-libsnd_render_default_la_DEPENDENCIES=
+snd_render_default_la_LDADD=	$(VORBISFILE_LIBS) $(VORBIS_LIBS) $(OGG_LIBS)
+snd_render_default_la_DEPENDENCIES=
 endif
 
 EXTRA_DIST= $(libasm_la_SOURCES)
diff --git a/libs/audio/targets/Makefile.am b/libs/audio/targets/Makefile.am
index 50d1c36c3..6be41637d 100644
--- a/libs/audio/targets/Makefile.am
+++ b/libs/audio/targets/Makefile.am
@@ -1,49 +1,60 @@
 AUTOMAKE_OPTIONS= foreign
 
-INCLUDES= -I$(top_srcdir)/include $(ALSA_CFLAGS) $(MME_CFLAGS) $(OSS_CFLAGS) $(SGISND_CFLAGS) $(SUNSND_CFLAGS) $(WIN32SND_CFLAGS) $(SDL_CFLAGS)
+AM_CFLAGS= @PREFER_PIC@
+INCLUDES= -I$(top_srcdir)/include
 SDL_LIBS = @SDL_LIBS@
 plugin_version= 1:0:0
 plugin_ldflags= @plugin_ldflags@
 plugin_libadd= @plugin_libadd@
+EXEEXT=
 
-plugin_LTLIBRARIES=	@SND_PLUGIN_TARGETS@
-noinst_LTLIBRARIES=	@SND_PLUGIN_STATIC@
-EXTRA_LTLIBRARIES= \
-	libsnd_output_sdl.la libsnd_output_alsa0_5.la libsnd_output_alsa0_9.la \
-	libsnd_output_oss.la libsnd_output_sgi.la libsnd_output_sun.la \
-	libsnd_output_win.la libsnd_output_null.la libsnd_output_disk.la
+plugin_PROGRAMS=	@SND_PLUGIN_TARGETS@
+noinst_PROGRAMS=	@SND_PLUGIN_STATIC@
+EXTRA_PROGRAMS= \
+	snd_output_sdl.la snd_output_alsa0_5.la snd_output_alsa0_9.la \
+	snd_output_oss.la snd_output_sgi.la snd_output_sun.la \
+	snd_output_win.la snd_output_null.la snd_output_disk.la
 
-libsnd_output_sdl_la_LDFLAGS=	$(plugin_ldflags)
-libsnd_output_sdl_la_LIBADD=	$(SDL_LIBS) $(plugin_libadd)
-libsnd_output_sdl_la_SOURCES=	snd_sdl.c
+snd_output_sdl_la_LDFLAGS=	$(plugin_ldflags)
+snd_output_sdl_la_LDADD=	$(SDL_LIBS) $(plugin_libadd)
+snd_output_sdl_la_CFLAGS=	$(SDL_CFLAGS)
+snd_output_sdl_la_SOURCES=	snd_sdl.c
 
-libsnd_output_alsa0_5_la_LDFLAGS=	$(plugin_ldflags)
-libsnd_output_alsa0_5_la_LIBADD=	$(ALSA_LIBS)
-libsnd_output_alsa0_5_la_SOURCES=	snd_alsa_0_5.c
+snd_output_alsa0_5_la_LDFLAGS=	$(plugin_ldflags)
+snd_output_alsa0_5_la_LDADD=	$(ALSA_LIBS)
+snd_output_alsa0_5_la_CFLAGS=	$(ALSA_CFLAGS)
+snd_output_alsa0_5_la_SOURCES=	snd_alsa_0_5.c
 
-libsnd_output_alsa0_9_la_LDFLAGS=	$(plugin_ldflags)
-libsnd_output_alsa0_9_la_LIBADD=
-libsnd_output_alsa0_9_la_SOURCES=	snd_alsa_0_9.c
+snd_output_alsa0_9_la_LDFLAGS=	$(plugin_ldflags)
+snd_output_alsa0_9_la_LDADD=
+snd_output_alsa0_9_la_CFLAGS=	$(ALSA_CFLAGS)
+snd_output_alsa0_9_la_SOURCES=	snd_alsa_0_9.c
 
-libsnd_output_oss_la_LDFLAGS=	$(plugin_ldflags)
-libsnd_output_oss_la_LIBADD=	$(OSS_LIBS)
-libsnd_output_oss_la_SOURCES=	snd_oss.c
+snd_output_oss_la_LDFLAGS=	$(plugin_ldflags)
+snd_output_oss_la_LDADD=	$(OSS_LIBS)
+snd_output_oss_la_CFLAGS=	$(OSS_CFLAGS)
+snd_output_oss_la_SOURCES=	snd_oss.c
 
-libsnd_output_sgi_la_LDFLAGS=	$(plugin_ldflags)
-libsnd_output_sgi_la_LIBADD=	$(SGISND_LIBS)
-libsnd_output_sgi_la_SOURCES=	snd_sgi.c
+snd_output_sgi_la_LDFLAGS=	$(plugin_ldflags)
+snd_output_sgi_la_LDADD=	$(SGISND_LIBS)
+snd_output_sgi_la_CFLAGS=	$(SGISND_CFLAGS)
+snd_output_sgi_la_SOURCES=	snd_sgi.c
 
-libsnd_output_sun_la_LDFLAGS=	$(plugin_ldflags)
-libsnd_output_sun_la_SOURCES=	snd_sun.c
+snd_output_sun_la_LDFLAGS=	$(plugin_ldflags)
+snd_output_sun_la_CFLAGS=	$(SUNSND_CFLAGS)
+snd_output_sun_la_SOURCES=	snd_sun.c
 
-libsnd_output_win_la_LDFLAGS=	$(plugin_ldflags)
-libsnd_output_win_la_LIBADD=	$(WINSND_LIBS) $(plugin_libadd)
-libsnd_output_win_la_SOURCES=	snd_win.c
+snd_output_win_la_LDFLAGS=	$(plugin_ldflags)
+snd_output_win_la_LDADD=	$(WINSND_LIBS) $(plugin_libadd)
+snd_output_win_la_CFLAGS=	$(WIN32SND_CFLAGS)
+snd_output_win_la_SOURCES=	snd_win.c
 
-libsnd_output_disk_la_LDFLAGS=	$(plugin_ldflags)
-libsnd_output_disk_la_LIBADD=	$(plugin_libadd)
-libsnd_output_disk_la_SOURCES=	snd_disk.c
+snd_output_disk_la_LDFLAGS=	$(plugin_ldflags)
+snd_output_disk_la_LDADD=	$(plugin_libadd)
+snd_output_disk_la_CFLAGS=
+snd_output_disk_la_SOURCES=	snd_disk.c
 
-libsnd_output_null_la_LDFLAGS=	$(plugin_ldflags)
-libsnd_output_null_la_LIBADD=	$(plugin_libadd)
-libsnd_output_null_la_SOURCES=	snd_null.c
+snd_output_null_la_LDFLAGS=	$(plugin_ldflags)
+snd_output_null_la_LDADD=	$(plugin_libadd)
+snd_output_null_la_CFLAGS=
+snd_output_null_la_SOURCES=	snd_null.c
diff --git a/libs/console/Makefile.am b/libs/console/Makefile.am
index b516b05ca..910a1ba0e 100644
--- a/libs/console/Makefile.am
+++ b/libs/console/Makefile.am
@@ -1,14 +1,16 @@
 AUTOMAKE_OPTIONS= foreign
 
+AM_CFLAGS= @PREFER_PIC@
 INCLUDES= -I$(top_srcdir)/include
 plugin_version= 1:0:0
 plugin_ldflags= @plugin_ldflags@
 plugin_libadd= @plugin_libadd@
+EXEEXT=
 
 lib_LTLIBRARIES=	libQFconsole.la
-plugin_LTLIBRARIES= @SERVER_PLUGIN_TARGETS@ @CLIENT_PLUGIN_TARGETS@
-noinst_LTLIBRARIES= @SERVER_PLUGIN_STATIC@ @CLIENT_PLUGIN_STATIC@
-EXTRA_LTLIBRARIES=  libconsole_server.la libconsole_client.la
+plugin_PROGRAMS= @SERVER_PLUGIN_TARGETS@ @CLIENT_PLUGIN_TARGETS@
+noinst_PROGRAMS= @SERVER_PLUGIN_STATIC@ @CLIENT_PLUGIN_STATIC@
+EXTRA_PROGRAMS=  console_server.la console_client.la
 
 common_sources= buffer.c complete.c console.c inputline.c list.c filelist.c
 client_sources= client.c menu.c
@@ -18,10 +20,10 @@ libQFconsole_la_LDFLAGS=	-version-info 1:0:0 -rpath $(libdir)
 libQFconsole_la_LIBADD=		$(plugin_libadd)
 libQFconsole_la_SOURCES=	$(common_sources)
 
-libconsole_client_la_LDFLAGS=	$(plugin_ldflags)
-libconsole_client_la_LIBADD=	$(plugin_libadd)
-libconsole_client_la_SOURCES=	$(client_sources)
+console_client_la_LDFLAGS=	$(plugin_ldflags)
+console_client_la_LDADD=	$(plugin_libadd)
+console_client_la_SOURCES=	$(client_sources)
 
-libconsole_server_la_LDFLAGS=	$(plugin_ldflags)
-libconsole_server_la_LIBADD=	$(CURSES_LIBS) $(plugin_libadd)
-libconsole_server_la_SOURCES=	$(server_sources)
+console_server_la_LDFLAGS=	$(plugin_ldflags)
+console_server_la_LDADD=	$(CURSES_LIBS) $(plugin_libadd)
+console_server_la_SOURCES=	$(server_sources)
diff --git a/libs/gamecode/builtins/Makefile.am b/libs/gamecode/builtins/Makefile.am
index 700cf9be9..21249d944 100644
--- a/libs/gamecode/builtins/Makefile.am
+++ b/libs/gamecode/builtins/Makefile.am
@@ -1,5 +1,6 @@
 AUTOMAKE_OPTIONS= foreign
 
+AM_CFLAGS= @PREFER_PIC@
 INCLUDES= -I$(top_srcdir)/include
 
 lib_LTLIBRARIES= libQFgamecode_builtins.la libQFcsqc.la
diff --git a/libs/gamecode/engine/Makefile.am b/libs/gamecode/engine/Makefile.am
index fb1b4e6b8..4608ab4f3 100644
--- a/libs/gamecode/engine/Makefile.am
+++ b/libs/gamecode/engine/Makefile.am
@@ -1,5 +1,6 @@
 AUTOMAKE_OPTIONS= foreign
 
+AM_CFLAGS= @PREFER_PIC@
 INCLUDES= -I$(top_srcdir)/include
 
 lib_LTLIBRARIES=	libQFgamecode.la
diff --git a/libs/models/Makefile.am b/libs/models/Makefile.am
index 20fd2ef9c..63e048caf 100644
--- a/libs/models/Makefile.am
+++ b/libs/models/Makefile.am
@@ -1,6 +1,7 @@
 AUTOMAKE_OPTIONS= foreign
 
 SUBDIRS= alias brush sprite
+AM_CFLAGS= @PREFER_PIC@
 INCLUDES= -I$(top_srcdir)/include
 
 lib_LTLIBRARIES=	libQFmodels.la @VID_MODEL_TARGETS@
diff --git a/libs/models/alias/Makefile.am b/libs/models/alias/Makefile.am
index b82094d04..615475f80 100644
--- a/libs/models/alias/Makefile.am
+++ b/libs/models/alias/Makefile.am
@@ -1,5 +1,6 @@
 AUTOMAKE_OPTIONS= foreign
 
+AM_CFLAGS= @PREFER_PIC@
 INCLUDES= -I$(top_srcdir)/include
 
 if BUILD_GL
diff --git a/libs/models/brush/Makefile.am b/libs/models/brush/Makefile.am
index 0e57da9bb..ae698dc6f 100644
--- a/libs/models/brush/Makefile.am
+++ b/libs/models/brush/Makefile.am
@@ -1,5 +1,6 @@
 AUTOMAKE_OPTIONS= foreign
 
+AM_CFLAGS= @PREFER_PIC@
 INCLUDES= -I$(top_srcdir)/include
 
 if BUILD_GL
diff --git a/libs/models/sprite/Makefile.am b/libs/models/sprite/Makefile.am
index 3a6147559..51170bedf 100644
--- a/libs/models/sprite/Makefile.am
+++ b/libs/models/sprite/Makefile.am
@@ -1,5 +1,6 @@
 AUTOMAKE_OPTIONS= foreign
 
+AM_CFLAGS= @PREFER_PIC@
 INCLUDES= -I$(top_srcdir)/include
 
 if BUILD_GL
diff --git a/libs/util/Makefile.am b/libs/util/Makefile.am
index b30b0d1a5..38211cd0e 100644
--- a/libs/util/Makefile.am
+++ b/libs/util/Makefile.am
@@ -1,5 +1,5 @@
 AUTOMAKE_OPTIONS= foreign
-
+AM_CFLAGS= @PREFER_PIC@
 INCLUDES= -I$(top_srcdir)/include
 
 lib_LTLIBRARIES= libQFutil.la
diff --git a/libs/util/plugin.c b/libs/util/plugin.c
index 855d353ad..ff8bd5849 100644
--- a/libs/util/plugin.c
+++ b/libs/util/plugin.c
@@ -117,7 +117,7 @@ static void
 pi_realname (char *realname, int size, const char *type, const char *name)
 {
 #if defined(HAVE_DLOPEN)
-	const char *format = "%s/lib%s_%s.so";
+	const char *format = "%s/%s_%s.so";
 #elif defined(_WIN32)
 	const char *format = "%s/QF%s_%s.dll";
 #else
diff --git a/libs/video/renderer/gl/Makefile.am b/libs/video/renderer/gl/Makefile.am
index 56a7c35ab..6ddf75e73 100644
--- a/libs/video/renderer/gl/Makefile.am
+++ b/libs/video/renderer/gl/Makefile.am
@@ -1,5 +1,6 @@
 AUTOMAKE_OPTIONS= foreign
 
+AM_CFLAGS= @PREFER_PIC@
 INCLUDES= -I$(top_srcdir)/include $(GLX_CFLAGS)
 
 if BUILD_GL
diff --git a/libs/video/renderer/sw/Makefile.am b/libs/video/renderer/sw/Makefile.am
index 78308c41d..651ee56e8 100644
--- a/libs/video/renderer/sw/Makefile.am
+++ b/libs/video/renderer/sw/Makefile.am
@@ -1,5 +1,6 @@
 AUTOMAKE_OPTIONS= foreign
 
+AM_CFLAGS= @PREFER_NON_PIC@
 INCLUDES= -I$(top_srcdir)/include
 
 if ASM_ARCH
diff --git a/libs/video/renderer/sw32/Makefile.am b/libs/video/renderer/sw32/Makefile.am
index c740fc357..fac6855c5 100644
--- a/libs/video/renderer/sw32/Makefile.am
+++ b/libs/video/renderer/sw32/Makefile.am
@@ -1,5 +1,6 @@
 AUTOMAKE_OPTIONS= foreign
 
+AM_CFLAGS= @PREFER_PIC@
 INCLUDES= -I$(top_srcdir)/include
 
 if BUILD_SW32
diff --git a/libs/video/targets/Makefile.am b/libs/video/targets/Makefile.am
index 81878862a..12122fb29 100644
--- a/libs/video/targets/Makefile.am
+++ b/libs/video/targets/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS= foreign
 
-INCLUDES= -I$(top_srcdir)/include $(MGL_CFLAGS) $(SDL_CFLAGS) $(SVGA_CFLAGS) $(X_CFLAGS) 
+INCLUDES= -I$(top_srcdir)/include
 
 if ASM_ARCH
 asm= libasm.la
@@ -10,13 +10,15 @@ endif
 
 lib_LTLIBRARIES= @JOY_TARGETS@
 
-noinst_LTLIBRARIES= @VID_TARGETS@
+noinst_LTLIBRARIES= @VID_TARGETS@ 
 
 EXTRA_LTLIBRARIES= \
 	libQFjs.la libQFfbdev.la libQFglx.la libQFsvga.la libQFtdfx.la \
-	libQFx11.la libQFsdl.la libQFsdl32.la libQFsgl.la libQFwgl.la libasm.la
+	libQFx11.la libQFsdl.la libQFsdl32.la libQFsgl.la libQFwgl.la libasm.la \
+	libcommon.la libgl.la libsdl.la libsw.la libsw32.la libsvga.la libx11.la
 
-libasm_la_SOURCES= d_copy.S
+libasm_la_SOURCES=		d_copy.S
+libasmn_la_CFLAGS=		@PREFER_NON_PIC@
 
 joy_linux_src= joy_linux.c
 joy_win_src= joy_win.c
@@ -31,12 +33,38 @@ joy_src=      $(joy_null_src)
 endif
 endif
 
-libQFjs_la_LDFLAGS=	-version-info 1:0:0 -rpath $(libdir)
-libQFjs_la_CFLAGS=      $(JOY_CFLAGS)
-libQFjs_la_SOURCES=      joy.c $(joy_src)
+libQFjs_la_LDFLAGS=		-version-info 1:0:0 -rpath $(libdir)
+libQFjs_la_CFLAGS=		@PREFER_PIC@ $(JOY_CFLAGS)
+libQFjs_la_SOURCES=		joy.c $(joy_src)
 EXTRA_libQFjs_la_SOURCES= $(joy_linux_src) $(joy_win_src) $(joy_null_src)
 
-in_common_SOURCE=	in_common.c in_event.c keys.c old_keys.c
+libcommon_la_SOURCES=	in_common.c in_event.c keys.c old_keys.c vid.c
+libcommon_la_CFLAGS=	@PREFER_NON_PIC@
+libcommon_la_LDFLAGS=	-static
+
+libsw_la_SOURCES=		vid_common_sw.c
+libsw_la_CFLAGS=		@PREFER_NON_PIC@
+libsw_la_LDFLAGS=		-static
+
+libsw32_la_SOURCES=		vid_common_sw32.c
+libsw32_la_CFLAGS=		@PREFER_NON_PIC@
+libsw32_la_LDFLAGS=		-static
+
+libgl_la_SOURCES=		vid_common_gl.c qfgl_ext.c
+libgl_la_CFLAGS=		@PREFER_NON_PIC@
+libgl_la_LDFLAGS=		-static
+
+libx11_la_SOURCES=		in_x11.c context_x11.c dga_check.c
+libx11_la_CFLAGS=		@PREFER_NON_PIC@ $(X_CFLAGS)
+libx11_la_LDFLAGS=		-static
+
+libsvga_la_SOURCES=		in_svgalib.c
+libsvga_la_CFLAGS=		@PREFER_NON_PIC@ $(SVGA_CFLAGS)
+libsvga_la_LDFLAGS=		-static
+
+libsdl_la_SOURCES=		in_sdl.c
+libsdl_la_CFLAGS=		@PREFER_NON_PIC@ $(SDL_CFLAGS)
+libsdl_la_LDFLAGS=		-static
 
 #
 # Linux FBdev
@@ -46,61 +74,78 @@ fbdev_h= fbset_modes_y.h
 YFLAGS = -d
 YACCLEX_CLEANFILES=	$(fbdev_c) $(fbdev_h)
 
-libQFfbdev_la_SOURCES=	fbset.c fbset_modes_y.y fbset_modes_l.l \
-			in_fbdev.c vid.c vid_common_sw.c vid_fbdev.c \
-			$(in_common_SOURCE)
+libQFfbdev_la_CFLAGS=		@PREFER_NON_PIC@
+libQFfbdev_la_SOURCES=		fbset.c fbset_modes_y.y fbset_modes_l.l \
+							in_fbdev.c vid_fbdev.c
+libQFfbdev_la_LDFLAGS=		-static
+libQFfbdev_la_LIBADD=		libcommon.la libsw.la
+libQFfbdev_la_DEPENDENCIES=	libcommon.la libsw.la
 
 #
 # OpenGL in X Window
 #
-libQFglx_la_SOURCES=	in_x11.c vid.c context_x11.c dga_check.c qfgl_ext.c \
-			vid_common_gl.c vid_glx.c \
-			$(in_common_SOURCE)
+libQFglx_la_CFLAGS=			@PREFER_NON_PIC@ $(X_CFLAGS)
+libQFglx_la_SOURCES=		vid_glx.c
+libQFglx_la_LDFLAGS=		-static
+libQFglx_la_LIBADD=			libcommon.la libgl.la libx11.la
+libQFglx_la_DEPENDENCIES=	libcommon.la libgl.la libx11.la
 
 #
 # Simple DirectMedia Library
 #
-libQFsdl_la_SOURCES=	in_sdl.c vid.c vid_common_sw.c vid_sdl.c \
-			$(in_common_SOURCE)
+libQFsdl_la_CFLAGS=			@PREFER_NON_PIC@ $(SDL_CFLAGS)
+libQFsdl_la_SOURCES=		vid_sdl.c
+libQFsdl_la_LDFLAGS=		-static
+libQFsdl_la_LIBADD=			libcommon.la libsw.la libsdl.la
+libQFsdl_la_DEPENDENCIES=	libcommon.la libsw.la libsdl.la
 
-libQFsdl32_la_SOURCES=	in_sdl.c vid.c vid_common_sw32.c vid_sdl32.c \
-			$(in_common_SOURCE)
+libQFsdl32_la_CFLAGS=		@PREFER_NON_PIC@ $(SDL_CFLAGS)
+libQFsdl32_la_SOURCES=		vid_sdl32.c
+libQFsdl32_la_LDFLAGS=		-static
+libQFsdl32_la_LIBADD=		libcommon.la libsw32.la libsdl.la
+libQFsdl32_la_DEPENDENCIES=	libcommon.la libsw32.la libsdl.la
 
-libQFsgl_la_SOURCES=	in_sdl.c qfgl_ext.c vid.c vid_common_gl.c vid_sgl.c \
-			$(in_common_SOURCE)
+libQFsgl_la_CFLAGS=			@PREFER_NON_PIC@ $(SDL_CFLAGS)
+libQFsgl_la_SOURCES=		vid_sgl.c
+libQFsgl_la_LDFLAGS=		-static
+libQFsgl_la_LIBADD=			libcommon.la libgl.la libsdl.la
+libQFsgl_la_DEPENDENCIES=	libcommon.la libgl.la libsdl.la
 
 #
 # SVGAlib
 #
-if ASM_ARCH
-libQFsvga_la_LIBADD=	$(asm)
-libQFsvga_la_DEPENDENCIES=$(asm)
-endif
-libQFsvga_la_SOURCES=	in_svgalib.c vid.c vid_common_sw.c vid_svgalib.c \
-			$(in_common_SOURCE)
+libQFsvga_la_CFLAGS=		@PREFER_NON_PIC@ $(SVGA_CFLAGS)
+libQFsvga_la_SOURCES=		vid_svgalib.c
+libQFsvga_la_LDFLAGS=		-static
+libQFsvga_la_LIBADD=		$(asm) libcommon.la libsw.la libsvga.la
+libQFsvga_la_DEPENDENCIES=	$(asm) libcommon.la libsw.la libsvga.la
 
 #
 # 3dfx
 #
-if ASM_ARCH
-libQFtdfx_la_LIBADD=    $(asm)
-libQFtdfx_la_DEPENDENCIES=$(asm)
-endif
-libQFtdfx_la_SOURCES=   in_svgalib.c vid.c vid_common_gl.c vid_3dfxsvga.c \
-                        qfgl_ext.c $(in_common_SOURCE)
+libQFtdfx_la_CFLAGS=		@PREFER_NON_PIC@ $(SVGA_CFLAGS)
+libQFtdfx_la_SOURCES=		vid_3dfxsvga.c
+libQFtdfx_la_LDFLAGS=		-static
+libQFtdfx_la_LIBADD=		$(asm) libcommon.la libgl.la libsvga.la
+libQFtdfx_la_DEPENDENCIES=	$(asm) libcommon.la libgl.la libsvga.la
 
 #
 # OpenGL in Win32
 #
-libQFwgl_la_SOURCES=	in_win.c qfgl_ext.c vid.c vid_common_gl.c vid_wgl.c \
-			$(in_common_SOURCE)
+libQFwgl_la_CFLAGS=			@PREFER_NON_PIC@ $(WGL_CFLAGS)
+libQFwgl_la_SOURCES=		in_win.c vid_wgl.c
+libQFwgl_la_LDFLAGS=		-static
+libQFwgl_la_LIBADD=			libcommon.la libgl.la
+libQFwgl_la_DEPENDENCIES=	libcommon.la libgl.la
 
 #
 # X11 software rendering
 #
-libQFx11_la_SOURCES=	in_x11.c vid.c context_x11.c dga_check.c \
-			vid_common_sw.c vid_x11.c \
-			$(in_common_SOURCE)
+libQFx11_la_CFLAGS=			@PREFER_NON_PIC@ $(X_CFLAGS)
+libQFx11_la_SOURCES=		vid_x11.c
+libQFx11_la_LDFLAGS=		-static
+libQFx11_la_LIBADD=			libcommon.la libsw.la libx11.la
+libQFx11_la_DEPENDENCIES=	libcommon.la libsw.la libx11.la
 
 # Kill the temp files, hopefully.
 CLEANFILES  = *.i *.s $(YACCLEX_CLEANFILES)
diff --git a/nq/source/Makefile.am b/nq/source/Makefile.am
index 5082b9ea7..bf3c3ef83 100644
--- a/nq/source/Makefile.am
+++ b/nq/source/Makefile.am
@@ -39,18 +39,18 @@ EXTRA_PROGRAMS= nq-fbdev nq-glx nq-mgl nq-sdl nq-sdl32 nq-sgl nq-svga nq-3dfx \
 		nq-wgl nq-x11 nq-server
 
 if ASM_ARCH
-asm= libasm.la
+asm= libasm.a
 else
 asm= 
 endif
 
 asm_src= worlda.S
 
-libasm_la_SOURCES= $(asm_src)
+libasm_a_SOURCES= $(asm_src)
 
-noinst_LTLIBRARIES= libqfnet.la $(asm)
+noinst_LIBRARIES= libcommon.a libclient.a libserver.a libqfnet.a $(asm)
 
-common_sources=	game.c world.c com.c
+libcommon_a_SOURCES=	game.c locs.c world.c com.c
 
 common_ldflags= -export-dynamic
 
@@ -60,9 +60,9 @@ net_sources= net_win.c net_wins.c
 else
 net_sources= net_bsd.c net_udp.c
 endif
-libqfnet_la_SOURCES= net_dgrm.c net_loop.c net_main.c net_vcr.c $(net_sources)
+libqfnet_a_SOURCES= net_dgrm.c net_loop.c net_main.c net_vcr.c $(net_sources)
 
-EXTRA_libqfnet_la_SOURCES= \
+EXTRA_libqfnet_a_SOURCES= \
 		net_dos.c net_bw.c net_bsd.c net_ipx.c net_mp.c net_win.c net_wins.c \
 		net_wipx.c net_udp.c
 
@@ -81,8 +81,8 @@ server_LIBFILES= \
 		$(top_builddir)/libs/console/libQFconsole.la
 
 common_LIBFILES= \
-		libasm.la \
-		libqfnet.la \
+		libasm.a \
+		libqfnet.a \
 		$(top_builddir)/libs/console/libQFconsole.la \
 		$(top_builddir)/libs/gamecode/builtins/libQFgamecode_builtins.la \
 		$(top_builddir)/libs/gamecode/engine/libQFgamecode.la \
@@ -93,15 +93,17 @@ client_LIBS=	$(client_LIBFILES) $(common_LIBFILES)
 server_LIBS=	$(server_LIBFILES) $(common_LIBFILES) $(NET_LIBS)
 server_LIB_DEPS=$(server_LIBFILES) $(common_LIBFILES)
 
-client_sources=	cl_cam.c cl_cmd.c cl_demo.c cl_input.c cl_main.c cl_screen.c \
+libclient_a_SOURCES= \
+		cl_cam.c cl_cmd.c cl_demo.c cl_input.c cl_main.c cl_screen.c \
 		cl_parse.c cl_tent.c cl_view.c host_skin.c skin.c \
-		locs.c sbar.c
+		sbar.c
 
-server_sources= host.c host_cmd.c pr_cmds.c sv_cvar.c sv_main.c \
+libserver_a_SOURCES= \
+		host.c host_cmd.c pr_cmds.c sv_cvar.c sv_main.c \
 		sv_move.c sv_cl_phys.c sv_phys.c sv_progs.c sv_user.c
 
-combined_sources= \
-		$(common_sources) $(client_sources) $(server_sources)
+client_libs= libserver.a libclient.a libcommon.a
+server_libs = libserver.a libcommon.a
 
 # Software-rendering targets
 
@@ -111,6 +113,7 @@ soft_QFLIBS=	$(top_builddir)/libs/video/renderer/libQFrenderer_sw.la \
 
 # ... Linux FBDev
 nq_fbdev_libs=  \
+			$(client_libs) \
 			$(cl_plugin_LIBS) \
 			$(soft_QFLIBS) \
 			$(top_builddir)/libs/video/targets/libQFfbdev.la \
@@ -122,6 +125,7 @@ nq_fbdev_DEPENDENCIES=	$(nq_fbdev_libs)
 
 # ... SciTech MGL
 nq_mgl_libs=  \
+			$(client_libs) \
 			$(cl_plugin_LIBS) \
 			$(soft_QFLIBS) \
 			$(top_builddir)/libs/video/targets/libQFmgl.la \
@@ -133,6 +137,7 @@ nq_mgl_DEPENDENCIES=	$(nq_mgl_libs)
 
 # ... SDL, version 1.2 and higher
 nq_sdl_libs=  \
+			$(client_libs) \
 			$(cl_plugin_LIBS) \
 			$(soft_QFLIBS) \
 			$(top_builddir)/libs/video/targets/libQFsdl.la \
@@ -140,10 +145,12 @@ nq_sdl_libs=  \
 nq_sdl_SOURCES= 	$(combined_sources) sys_sdl.c
 nq_sdl_LDADD=		$(nq_sdl_libs) $(SDL_LIBS) $(NET_LIBS)
 nq_sdl_LDFLAGS= 	$(common_ldflags)
+nq_sdl_CFLAGS=	 	$(SDL_CFLAGS)
 nq_sdl_DEPENDENCIES=	$(nq_sdl_libs)
 
 # ... 32-bit software, SDL
 nq_sdl32_libs=  \
+			$(client_libs) \
 			$(cl_plugin_LIBS) \
 			$(top_builddir)/libs/video/renderer/libQFrenderer_sw32.la \
 			$(top_builddir)/libs/models/libQFmodels_sw.la \
@@ -152,10 +159,12 @@ nq_sdl32_libs=  \
 nq_sdl32_SOURCES=	$(combined_sources) sys_sdl.c
 nq_sdl32_LDADD= 	$(nq_sdl32_libs) $(SDL_LIBS) $(NET_LIBS)
 nq_sdl32_LDFLAGS=	$(common_ldflags)
+nq_sdl32_CFLAGS= 	$(SDL_CFLAGS)
 nq_sdl32_DEPENDENCIES=	$(nq_sdl32_libs)
 
 # ... Linux SVGAlib
 nq_svga_libs=  \
+			$(client_libs) \
 			$(cl_plugin_LIBS) \
 			$(soft_QFLIBS) \
 			$(top_builddir)/libs/video/targets/libQFsvga.la \
@@ -167,6 +176,7 @@ nq_svga_DEPENDENCIES=	$(nq_svga_libs)
 
 # ... X11
 nq_x11_libs=  \
+			$(client_libs) \
 			$(cl_plugin_LIBS) \
 			$(soft_QFLIBS) \
 			$(top_builddir)/libs/video/targets/libQFx11.la \
@@ -186,6 +196,7 @@ opengl_QFLIBS= \
 
 # ... Linux 3DFX
 nq_3dfx_libs=  \
+			$(client_libs) \
 			$(cl_plugin_LIBS) \
 			$(opengl_QFLIBS) \
 			$(top_builddir)/libs/video/targets/libQFtdfx.la \
@@ -197,6 +208,7 @@ nq_3dfx_DEPENDENCIES= 	$(nq_3dfx_libs)
 							
 # ... OpenGL in X Window
 nq_glx_libs=  \
+			$(client_libs) \
 			$(cl_plugin_LIBS) \
 			$(opengl_QFLIBS) \
 			$(top_builddir)/libs/video/targets/libQFglx.la \
@@ -210,6 +222,7 @@ nq_glx_DEPENDENCIES=	$(nq_glx_libs)
 
 # ... Simple Directmedia Layer, version 1.2 and higher, in GL mode
 nq_sgl_libs=  \
+			$(client_libs) \
 			$(cl_plugin_LIBS) \
 			$(opengl_QFLIBS) \
 			$(top_builddir)/libs/video/targets/libQFsgl.la \
@@ -217,10 +230,12 @@ nq_sgl_libs=  \
 nq_sgl_SOURCES= 	$(combined_sources) sys_sdl.c
 nq_sgl_LDADD=		$(nq_sgl_libs) $(SDL_LIBS) $(DL_LIBS) $(NET_LIBS)
 nq_sgl_LDFLAGS= 	$(common_ldflags)
+nq_sgl_CFLAGS=	 	$(SDL_CFLAGS)
 nq_sgl_DEPENDENCIES=	$(nq_sgl_libs)
 
 # ... SGI/Microsoft WGL (Windows OpenGL)
 nq_wgl_libs=  \
+			$(client_libs) \
 			$(cl_plugin_LIBS) \
 			$(opengl_QFLIBS) \
 			$(top_builddir)/libs/video/targets/libQFwgl.la \
@@ -237,9 +252,9 @@ else
 ded_sources=	sys_unixd.c sv_ded.c sv_model.c
 endif
 nq_server_LDFLAGS=	$(common_ldflags)
-nq_server_SOURCES=	$(common_sources) $(server_sources) $(ded_sources)
-nq_server_LDADD=	$(server_LIBS)
-nq_server_DEPENDENCIES=	$(server_LIB_DEPS)
+nq_server_SOURCES=	$(ded_sources)
+nq_server_LDADD=	$(server_libs) $(server_LIBS)
+nq_server_DEPENDENCIES=	$(server_libs) $(server_LIB_DEPS)
 
 # Stuff that doesn't get linked into an executable NEEDS to be mentioned here,
 # or it won't be distributed with 'make dist'
@@ -247,17 +262,3 @@ EXTRA_DIST=	$(asm_src)
 
 # Kill the temp files, hopefully.
 CLEANFILES  = *.i *.s $(YACCLEX_CLEANFILES)
-
-sys_sdl.o: sys_sdl.c
-	@echo '$(COMPILE) $(SDL_CFLAGS) -c $<'; \
-	if test -d .deps; then \
-		$(COMPILE) $(SDL_CFLAGS) -Wp,-MD,.deps/$(*F).pp -c $<; \
-	else \
-		$(COMPILE) $(SDL_CFLAGS) -c $<; \
-	fi
-	@-if test -d .deps; then cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm .deps/$(*F).pp; \
-	fi
diff --git a/nq/source/host.c b/nq/source/host.c
index 4b26a0909..efb1874d0 100644
--- a/nq/source/host.c
+++ b/nq/source/host.c
@@ -41,6 +41,7 @@ static const char rcsid[] =
 #include "QF/draw.h"
 #include "QF/input.h"
 #include "QF/keys.h"
+#include "QF/locs.h"
 #include "QF/msg.h"
 #include "QF/plugin.h"
 #include "QF/progs.h"
@@ -60,6 +61,8 @@ static const char rcsid[] =
 #include "sv_progs.h"
 #include "view.h"
 
+static location_t * (* const _locs_find) (const vec3_t target) = locs_find;
+
 
 /*
   A server can always be started, even if the system started out as a client
diff --git a/qw/source/Makefile.am b/qw/source/Makefile.am
index b3393dd54..9c346d846 100644
--- a/qw/source/Makefile.am
+++ b/qw/source/Makefile.am
@@ -40,18 +40,18 @@ EXTRA_PROGRAMS= qw-client-fbdev qw-client-glx qw-client-mgl qw-client-sdl \
 		qw-client-wgl qw-client-x11 qw-server qw-master
 
 if ASM_ARCH
-asm= libasm.la
+asm= libasm.a
 else
 asm=
 endif
 
 asm_src= worlda.S
 
-libasm_la_SOURCES= $(asm_src)
+libasm_a_SOURCES= $(asm_src)
 
-noinst_LTLIBRARIES= libqfnet.la $(asm)
+noinst_LIBRARIES= libqfnet.a libcommon.a libserver.a libclient.a $(asm)
 
-common_sources= com.c game.c msg_ucmd.c pmove.c pmovetst.c net_packetlog.c
+libcommon_a_SOURCES= com.c game.c msg_ucmd.c pmove.c pmovetst.c net_packetlog.c
 
 common_ldflags= -export-dynamic
 
@@ -63,8 +63,8 @@ ipvX_src= $(ipv6_src)
 else
 ipvX_src= $(ipv4_src)
 endif
-libqfnet_la_SOURCES=	net_chan.c $(ipvX_src)
-EXTRA_libqfnet_la_SOURCES= $(ipv4_src) $(ipv6_src)
+libqfnet_a_SOURCES=	net_chan.c $(ipvX_src)
+EXTRA_libqfnet_a_SOURCES= $(ipv4_src) $(ipv6_src)
 
 # Server builds
 #
@@ -75,8 +75,8 @@ else
 syssv_SRC=	sv_sys_unix.c
 endif
 
-server_sources= crudefile.c sv_ccmds.c sv_cvar.c sv_ents.c \
-		sv_init.c sv_main.c sv_model.c sv_move.c \
+libserver_a_SOURCES= crudefile.c sv_ccmds.c sv_cvar.c sv_ents.c \
+		sv_init.c sv_main.c sv_move.c \
 		sv_nchan.c sv_phys.c sv_pr_cmds.c sv_progs.c sv_send.c \
 		sv_user.c world.c $(syssv_SRC)
 
@@ -89,10 +89,10 @@ qf_server_LIBS= \
 		$(top_builddir)/libs/console/libQFconsole.la \
 		$(top_builddir)/libs/util/libQFutil.la
 
-qw_server_SOURCES=	$(common_sources) $(server_sources)
-qw_server_LDADD=	libqfnet.la libasm.la $(qf_server_LIBS) $(NET_LIBS) $(DL_LIBS) $(CURSES_LIBS)
+qw_server_SOURCES=	sv_model.c 
+qw_server_LDADD=	libserver.a libcommon.a libqfnet.a libasm.a $(qf_server_LIBS) $(NET_LIBS) $(DL_LIBS) $(CURSES_LIBS)
 qw_server_LDFLAGS=	$(common_ldflags)
-qw_server_DEPENDENCIES=	libqfnet.la libasm.la $(qf_server_LIBS)
+qw_server_DEPENDENCIES=	libcommon.a libserver.a libqfnet.a libasm.a $(qf_server_LIBS)
 
 qw_master_SOURCES=	master.c
 qw_master_LDADD=	$(top_builddir)/libs/util/libQFutil.la $(NET_LIBS)
@@ -111,10 +111,12 @@ qf_client_LIBS= \
 		$(top_builddir)/libs/audio/libQFsound.la \
 		$(top_builddir)/libs/util/libQFutil.la
 
-client_LIBS= libqfnet.la libasm.la $(qf_client_LIBS)
+client_LIBS= libqfnet.a libasm.a $(qf_client_LIBS)
+client_libs= libclient.a libcommon.a
 
-client_sources= cl_cam.c cl_cmd.c cl_cvar.c cl_demo.c cl_ents.c cl_input.c \
-		cl_main.c cl_misc.c cl_ngraph.c cl_parse.c cl_pred.c \
+libclient_a_SOURCES= \
+		cl_cam.c cl_cmd.c cl_cvar.c cl_demo.c cl_ents.c cl_input.c \
+		cl_main.c cl_ngraph.c cl_parse.c cl_pred.c \
 		cl_screen.c cl_skin.c cl_slist.c cl_tent.c cl_view.c \
 		locs.c sbar.c skin.c teamplay.c
 
@@ -126,67 +128,75 @@ soft_LIBS=	$(top_builddir)/libs/video/renderer/libQFrenderer_sw.la \
 
 # ... Linux FBDev
 qw_client_fbdev_libs= \
+			$(client_libs) \
 			$(cl_plugin_LIBS) \
 			$(soft_LIBS) \
 			$(top_builddir)/libs/video/targets/libQFfbdev.la \
 			$(client_LIBS)
-qw_client_fbdev_SOURCES= $(common_sources) $(client_sources) cl_sys_unix.c
+qw_client_fbdev_SOURCES= cl_sys_unix.c
 qw_client_fbdev_LDADD= $(qw_client_fbdev_libs) $(NET_LIBS)
 qw_client_fbdev_LDFLAGS= $(common_ldflags)
 qw_client_fbdev_DEPENDENCIES= $(qw_client_fbdev_libs)
 
 # ... SciTech MGL
 qw_client_mgl_libs= \
+			$(client_libs) \
 			$(cl_plugin_LIBS) \
 			$(soft_LIBS) \
 			$(top_builddir)/libs/video/targets/libQFmgl.la \
 			$(client_LIBS)
-qw_client_mgl_SOURCES=	$(common_sources) $(client_sources) cl_sys_win.c
+qw_client_mgl_SOURCES=	cl_sys_win.c
 qw_client_mgl_LDADD= $(qw_client_mgl_libs) $(MGL_LIBS) $(NET_LIBS)
 qw_client_mgl_LDFLAGS=  $(common_ldflags)
 qw_client_mgl_DEPENDENCIES= $(qw_client_mgl_libs)
 
 # ... Simple DirectMedia Layer, version 1.2 and higher
 qw_client_sdl_libs= \
+			$(client_libs) \
 			$(cl_plugin_LIBS) \
 			$(soft_LIBS) \
 			$(top_builddir)/libs/video/targets/libQFsdl.la \
 			$(client_LIBS)
-qw_client_sdl_SOURCES=	$(common_sources) $(client_sources) cl_sys_sdl.c
+qw_client_sdl_SOURCES=	cl_sys_sdl.c
 qw_client_sdl_LDADD= $(qw_client_sdl_libs) $(SDL_LIBS) $(NET_LIBS)
 qw_client_sdl_LDFLAGS=  $(common_ldflags)
+qw_client_sdl_CFLAGS=$(SDL_CFLAGS)
 qw_client_sdl_DEPENDENCIES= $(qw_client_sdl_libs)
 
 # ... 32-bit software, SDL
 qw_client_sdl32_libs= \
+			$(client_libs) \
 			$(cl_plugin_LIBS) \
 			$(top_builddir)/libs/video/renderer/libQFrenderer_sw32.la \
 			$(top_builddir)/libs/models/libQFmodels_sw.la \
 			$(top_builddir)/libs/video/targets/libQFsdl32.la \
 			$(client_LIBS)
-qw_client_sdl32_SOURCES=$(qw_client_sdl_SOURCES)
+qw_client_sdl32_SOURCES=cl_sys_sdl.c
 qw_client_sdl32_LDADD= $(qw_client_sdl32_libs) $(SDL_LIBS) $(NET_LIBS)
 qw_client_sdl32_LDFLAGS=$(common_ldflags)
+qw_client_sdl32_CFLAGS=$(SDL_CFLAGS)
 qw_client_sdl32_DEPENDENCIES= $(qw_client_sdl32_libs)
 
 # ... Linux SVGAlib
 qw_client_svga_libs= \
+			$(client_libs) \
 			$(cl_plugin_LIBS) \
 			$(soft_LIBS) \
 			$(top_builddir)/libs/video/targets/libQFsvga.la \
 			$(client_LIBS)
-qw_client_svga_SOURCES= $(common_sources) $(client_sources) cl_sys_unix.c
+qw_client_svga_SOURCES= cl_sys_unix.c
 qw_client_svga_LDADD= $(qw_client_svga_libs) $(SVGA_LIBS) $(NET_LIBS)
 qw_client_svga_LDFLAGS=  $(common_ldflags)
 qw_client_svga_DEPENDENCIES= $(qw_client_svga_libs)
 
 # ... X11
 qw_client_x11_libs= \
+			$(client_libs) \
 			$(cl_plugin_LIBS) \
 			$(soft_LIBS) \
 			$(top_builddir)/libs/video/targets/libQFx11.la \
 			$(client_LIBS)
-qw_client_x11_SOURCES=	$(common_sources) $(client_sources) cl_sys_unix.c
+qw_client_x11_SOURCES=	cl_sys_unix.c
 qw_client_x11_LDADD= $(qw_client_x11_libs) \
 			$(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \
 			$(X_EXTRA_LIBS) $(X_SHM_LIB) $(NET_LIBS)
@@ -200,11 +210,12 @@ opengl_LIBS=	$(top_builddir)/libs/video/renderer/libQFrenderer_gl.la \
 
 # ... OpenGL in X Window
 qw_client_glx_libs= \
+			$(client_libs) \
 			$(cl_plugin_LIBS) \
 			$(opengl_LIBS) \
 			$(top_builddir)/libs/video/targets/libQFglx.la \
 			$(client_LIBS)
-qw_client_glx_SOURCES=	$(common_sources) $(client_sources) cl_sys_unix.c
+qw_client_glx_SOURCES=	cl_sys_unix.c
 qw_client_glx_LDADD= $(qw_client_glx_libs) \
 			$(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \
 			-lXext $(X_EXTRA_LIBS) $(DL_LIBS) $(NET_LIBS)
@@ -213,11 +224,12 @@ qw_client_glx_DEPENDENCIES= $(qw_client_glx_libs)
 
 # ... Linux 3DFX
 qw_client_3dfx_libs= \
+			$(client_libs) \
 			$(cl_plugin_LIBS) \
 			$(opengl_LIBS) \
 			$(top_builddir)/libs/video/targets/libQFtdfx.la \
 			$(client_LIBS)
-qw_client_3dfx_SOURCES= $(common_sources) $(client_sources) cl_sys_unix.c
+qw_client_3dfx_SOURCES= cl_sys_unix.c
 qw_client_3dfx_LDADD= $(qw_client_3dfx_libs) \
 			$(SVGA_LIBS) $(NET_LIBS)
 qw_client_3dfx_LDFLAGS=  $(common_ldflags)
@@ -225,22 +237,25 @@ qw_client_3dfx_DEPENDENCIES= $(qw_client_3dfx_libs)
 
 # ... Simple DirectMedia Layer, version 1.2 and higher, in GL mode
 qw_client_sgl_libs= \
+			$(client_libs) \
 			$(cl_plugin_LIBS) \
 			$(opengl_LIBS) \
 			$(top_builddir)/libs/video/targets/libQFsgl.la \
 			$(client_LIBS)
-qw_client_sgl_SOURCES=	$(common_sources) $(client_sources) cl_sys_sdl.c
+qw_client_sgl_SOURCES=	cl_sys_sdl.c
 qw_client_sgl_LDADD= $(qw_client_sgl_libs) $(SDL_LIBS) $(DL_LIBS) $(NET_LIBS)
 qw_client_sgl_LDFLAGS=  $(common_ldflags)
+qw_client_sgl_CFLAGS=$(SDL_CFLAGS)
 qw_client_sgl_DEPENDENCIES= $(qw_client_sgl_libs)
 
 # ... SGI/Microsoft WGL (Windows OpenGL)
 qw_client_wgl_libs= \
+			$(client_libs) \
 			$(cl_plugin_LIBS) \
 			$(opengl_LIBS) \
 			$(top_builddir)/libs/video/targets/libQFwgl.la \
 			$(client_LIBS)
-qw_client_wgl_SOURCES=	$(common_sources) $(client_sources) cl_sys_win.c
+qw_client_wgl_SOURCES=	cl_sys_win.c
 qw_client_wgl_LDADD= $(qw_client_wgl_libs) -lgdi32 -lwinmm $(NET_LIBS)
 qw_client_wgl_LDFLAGS=  $(common_ldflags)
 qw_client_wgl_DEPENDENCIES= $(qw_client_wgl_libs)
@@ -251,17 +266,3 @@ EXTRA_DIST=	$(asm_src)
 
 # Kill the temp files, hopefully.
 CLEANFILES	= *.i *.s $(YACCLEX_CLEANFILES)
-
-cl_sys_sdl.o: cl_sys_sdl.c
-	@echo '$(COMPILE) $(SDL_CFLAGS) -c $<'; \
-	if test -d .deps; then \
-		$(COMPILE) $(SDL_CFLAGS) -Wp,-MD,.deps/$(*F).pp -c $<; \
-	else \
-		$(COMPILE) $(SDL_CFLAGS) -c $<; \
-	fi
-	@-if test -d .deps; then cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm .deps/$(*F).pp; \
-	fi
diff --git a/qw/source/cl_main.c b/qw/source/cl_main.c
index 4e3c94cc6..f993aede5 100644
--- a/qw/source/cl_main.c
+++ b/qw/source/cl_main.c
@@ -1839,3 +1839,9 @@ Host_Shutdown (void)
 	if (vid_basepal)
 		VID_Shutdown ();
 }
+
+qboolean
+ServerPaused (void)
+{
+	return false;
+}
diff --git a/qw/source/cl_misc.c b/qw/source/cl_misc.c
index 89fcf8780..668726ca8 100644
--- a/qw/source/cl_misc.c
+++ b/qw/source/cl_misc.c
@@ -33,9 +33,3 @@ static const char rcsid[] =
 
 #include "QF/qtypes.h"
 
-
-qboolean
-ServerPaused (void)
-{
-	return false;
-}