diff --git a/.gitignore b/.gitignore
index b37dcf0ad..89ac35a66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ config.log
 config.status
 configure
 configure-stamp
+libtool
diff --git a/bootstrap b/bootstrap
index 3115aa7bf..6f9467c1e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,2 +1,2 @@
 #!/bin/sh
-aclocal && autoheader && automake --add-missing && autoconf
+aclocal && autoheader && libtoolize --automake && automake --add-missing && autoconf
diff --git a/configure.in b/configure.in
index 7e4569c1c..67c322a5e 100644
--- a/configure.in
+++ b/configure.in
@@ -59,7 +59,7 @@ AC_PROG_INSTALL
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_LN_S
-AC_PROG_RANLIB
+AM_PROG_LIBTOOL
 AM_PROG_LEX
 AC_PROG_YACC
 
diff --git a/libs/gamecode/.gitignore b/libs/gamecode/.gitignore
index a699700aa..37c6abd73 100644
--- a/libs/gamecode/.gitignore
+++ b/libs/gamecode/.gitignore
@@ -1,4 +1,8 @@
+*.la
+*.lo
 .deps
+.libs
 .vimrc
-Makefile.in
 Makefile
+Makefile.in
+
diff --git a/libs/gamecode/Makefile.am b/libs/gamecode/Makefile.am
index 8fc7f9c23..2f8d35df7 100644
--- a/libs/gamecode/Makefile.am
+++ b/libs/gamecode/Makefile.am
@@ -1,8 +1,6 @@
-noinst_LIBRARIES = libqfgamecode.a
+lib_LTLIBRARIES = libQFgamecode.la
 
-libqfgamecode_a_SOURCES = pr_edict.c pr_exec.c pr_strings.c
+libQFgamecode_la_LDFLAGS = -version-info 1:0:0
+libQFgamecode_la_SOURCES = pr_edict.c pr_exec.c pr_strings.c
 
-all-local: ../libqfgamecode.a
-
-../libqfgamecode.a: libqfgamecode.a
-	cp $(noinst_LIBRARIES) ..
+LIBLIST = libQFgamecode.la @LIBRARY_SEARCH_PATH@
diff --git a/libs/util/.gitignore b/libs/util/.gitignore
index 6695075a0..f4a8d5fec 100644
--- a/libs/util/.gitignore
+++ b/libs/util/.gitignore
@@ -1,4 +1,7 @@
-.vimrc
-Makefile.in
-Makefile
+*.la
+*.lo
 .deps
+.libs
+.vimrc
+Makefile
+Makefile.in
diff --git a/libs/util/Makefile.am b/libs/util/Makefile.am
index 0267272b3..5718dd8f4 100644
--- a/libs/util/Makefile.am
+++ b/libs/util/Makefile.am
@@ -1,8 +1,9 @@
-noinst_LIBRARIES = libqfutil.a
+lib_LTLIBRARIES = libQFutil.la
 
-libqfutil_a_SOURCES = checksum.c cmd.c crc.c cvar.c hash.c info.c link.c math.S mathlib.c mdfour.c msg.c qargs.c qendian.c qfplist.c sizebuf.c va.c ver_check.c zone.c
+libQFutil_la_LDFLAGS = -version-info 1:0:0
+libQFutil_la_SOURCES = \
+	checksum.c cmd.c crc.c cvar.c hash.c info.c link.c math.S mathlib.c \
+	mdfour.c msg.c qargs.c qendian.c qfplist.c sizebuf.c va.c ver_check.c \
+	zone.c
 
-all-local: ../libqfutil.a
-
-../libqfutil.a: libqfutil.a
-	cp $(noinst_LIBRARIES) ..
+LIBLIST = libQFutil.la @LIBRARY_SEARCH_PATH@
diff --git a/nq/source/.gitignore b/nq/source/.gitignore
index d64e5307b..39e96fd96 100644
--- a/nq/source/.gitignore
+++ b/nq/source/.gitignore
@@ -1,16 +1,17 @@
-.vimrc
 *.a
 *.d
 *.o
 *.obj
+.deps
+.libs
+.vimrc
 Makefile
 Makefile.in
+nq-3dfx
 nq-glx
 nq-sdl
-nq-svga
-nq-x11
-nq-3dfx
 nq-sgl
-nq.exe
+nq-svga
 nq-wgl.exe
-.deps
+nq-x11
+nq.exe
diff --git a/nq/source/Makefile.am b/nq/source/Makefile.am
index 6c0be4673..89e9f3ae6 100644
--- a/nq/source/Makefile.am
+++ b/nq/source/Makefile.am
@@ -26,6 +26,7 @@
 #
 #	$Id$
 #
+AUTOMAKE_OPTIONS=	foreign
 
 #
 # Stuff that is common to both client and server
@@ -128,8 +129,8 @@ libqfnet_a_SOURCES=	net_bsd.c net_dgrm.c net_loop.c \
 EXTRA_libqfcd_a_SOURCES=net_dos.c net_bw.c net_ipx.c net_mp.c net_ser.c \
 			net_win.c net_wins.c net_wipx.c
 
-client_LIBS=	-L. -L../../libs -lqfsys -lqfsnd -lqfcd -lqfjs -lqfnet -lqfgamecode -lqfutil $(SOUND_LIBS) $(NET_LIBS) $(Z_LIBS)
-client_LIB_DEPS= libqfsys.a libqfsnd.a libqfcd.a libqfjs.a libqfnet.a ../../libs/libqfgamecode.a ../../libs/libqfutil.a
+client_LIBS=	$(top_builddir)/libs/gamecode/libQFgamecode.la $(top_builddir)/libs/util/libQFutil.la -L. -lqfsys -lqfsnd -lqfcd -lqfjs -lqfnet $(SOUND_LIBS) $(NET_LIBS) $(Z_LIBS)
+client_LIB_DEPS= libqfsys.a libqfsnd.a libqfcd.a libqfjs.a libqfnet.a
 
 client_SOURCES= cl_cam.c cl_cmd.c cl_demo.c cl_input.c cl_main.c cl_parse.c \
 		cl_tent.c console.c keys.c sbar.c r_part.c r_view.c \
diff --git a/qw/source/.gitignore b/qw/source/.gitignore
index e19660a74..6d9bc945c 100644
--- a/qw/source/.gitignore
+++ b/qw/source/.gitignore
@@ -5,10 +5,14 @@
 *.obj
 *.s
 .deps
+.libs
 .vimrc
 Makefile
 Makefile.in
 client.exe
+fbset_modes_l.c
+fbset_modes_y.c
+fbset_modes_y.h
 qw-client-3dfx
 qw-client-3dfx.exe
 qw-client-fbdev
@@ -24,6 +28,3 @@ qw-client-x11
 qw-client-x11.exe
 qw-server
 qw-server.exe
-fbset_modes_y.c
-fbset_modes_y.h
-fbset_modes_l.c
diff --git a/qw/source/Makefile.am b/qw/source/Makefile.am
index e996d0946..c05408523 100644
--- a/qw/source/Makefile.am
+++ b/qw/source/Makefile.am
@@ -86,8 +86,8 @@ server_SOURCES=	sv_ccmds.c sv_cvar.c \
 		sv_user.c world.c $(world_ASM)
 
 qw_server_SOURCES=	$(common_SOURCES) $(server_SOURCES)
-qw_server_LDADD=	-L. -L../../libs -lqfnet -lqfsys_sv -lqfgamecode -lqfutil $(NET_LIBS) $(Z_LIBS) $(DL_LIBS)
-qw_server_DEPENDENCIES= libqfnet.a libqfsys_sv.a ../../libs/libqfgamecode.a  ../../libs/libqfutil.a
+qw_server_LDADD= 	$(top_builddir)/libs/util/libQFutil.la $(top_builddir)/libs/gamecode/libQFgamecode.la -L. -lqfnet -lqfsys_sv $(NET_LIBS) $(Z_LIBS) $(DL_LIBS)
+qw_server_DEPENDENCIES= libqfnet.a libqfsys_sv.a
 
 #
 # Client builds
@@ -170,8 +170,8 @@ endif
 libqfjs_a_CFLAGS=	$(JOY_CFLAGS)
 EXTRA_libqfjs_a_SOURCES= joy_linux.c joy_win.c joy_null.c
 
-CLIENT_LIBS=	-L. -L../../libs -lqfnet -lqfsys_cl -lqfsnd -lqfcd -lqfjs -lqfgamecode -lqfutil $(SOUND_LIBS) $(NET_LIBS) $(CD_LIBS) $(JOY_LIBS) $(Z_LIBS)
-CLIENT_LIB_DEPS= libqfnet.a libqfsys_cl.a libqfsnd.a libqfcd.a libqfjs.a ../../libs/libqfgamecode.a ../../libs/libqfutil.a
+CLIENT_LIBS=		$(top_builddir)/libs/util/libQFutil.la $(top_builddir)/libs/gamecode/libQFgamecode.la -L. -lqfnet -lqfsys_cl -lqfsnd -lqfcd -lqfjs $(SOUND_LIBS) $(NET_LIBS) $(CD_LIBS) $(JOY_LIBS) $(Z_LIBS)
+CLIENT_LIB_DEPS=	libqfnet.a libqfsys_cl.a libqfsnd.a libqfcd.a libqfjs.a
 
 if ASM_ARCH
 client_ASM=	snd_mixa.S cl_math.S