diff --git a/configure.ac b/configure.ac
index 3eae86505..530636b5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1410,8 +1410,6 @@ AC_SUBST(AS)
 AC_SUBST(ASFLAGS)
 AC_SUBST(CCAS)
 AC_SUBST(CCASFLAGS)
-AC_SUBST(plugin_ldflags)
-AC_SUBST(plugin_libadd)
 
 dnl ==================================================================
 dnl Make sure we link against a working zlib
@@ -1744,7 +1742,6 @@ else
 	unset SOUND_TYPES
 fi
 
-PLUGIN_RPATH='-rpath $(plugindir)'
 SERVER_PLUGIN_TARGETS="libconsole_server.la"
 SERVER_PLUGIN_STATIC=""
 CLIENT_PLUGIN_TARGETS="libconsole_client.la"
@@ -1761,7 +1758,6 @@ if test "x$static_plugins" = xauto -a "x$SYSTYPE" = xWIN32; then
 fi
 if test "x$static_plugins" = xyes; then
 	AC_DEFINE(STATIC_PLUGINS, 1, [Define this if you are building static plugins])
-	PLUGIN_RPATH=''
 	SERVER_PLUGIN_STATIC="$SERVER_PLUGIN_TARGETS"
 	SERVER_PLUGIN_TARGETS=""
 	CLIENT_PLUGIN_STATIC="$CLIENT_PLUGIN_TARGETS"
@@ -1776,6 +1772,8 @@ if test "x$static_plugins" = xyes; then
 		SOUND_TYPES="$SOUND_TYPES (static)"
 		CDTYPE="$CDTYPE (static)"
 	fi
+else
+	plugin_ldflags="$plugin_ldflags"' -version-info $(plugin_version) -rpath $(plugindir)'
 fi
 SERVER_PLUGIN_STATIC_LIBS=""
 CLIENT_PLUGIN_STATIC_LIBS=""
@@ -1835,7 +1833,6 @@ AC_DEFINE_UNQUOTED(SND_RENDER_PROTOS, $SND_RENDER_PROTOS, [list of sound render
 
 AC_SUBST(NQ_TARGETS)
 AC_SUBST(QW_TARGETS)
-AC_SUBST(PLUGIN_RPATH)
 AC_SUBST(SERVER_PLUGIN_STATIC)
 AC_SUBST(SERVER_PLUGIN_STATIC_LIBS)
 AC_SUBST(SERVER_PLUGIN_TARGETS)
@@ -1858,6 +1855,8 @@ AC_SUBST(VID_MODEL_TARGETS)
 AC_SUBST(VID_REND_TARGETS)
 AC_SUBST(VID_REND_NOINST_TARGETS)
 AC_SUBST(VID_TARGETS)
+AC_SUBST(plugin_ldflags)
+AC_SUBST(plugin_libadd)
 
 QFCC_DEPS='$(top_builddir)/libs/gamecode/engine/libQFgamecode.la $(top_builddir)/libs/util/libQFutil.la'
 QFCC_LIBS="${QFCC_DEPS} ${WINMM}"
diff --git a/libs/audio/cd/Makefile.am b/libs/audio/cd/Makefile.am
index d493990b5..f5b7af6c0 100644
--- a/libs/audio/cd/Makefile.am
+++ b/libs/audio/cd/Makefile.am
@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS= foreign
 INCLUDES= -I$(top_srcdir)/include $(SDL_CFLAGS) $(XMMS_CFLAGS)
 SDL_LIBS= @SDL_LIBS@
 XMMS_LIBS= @XMMS_LIBS@
-PLUGIN_RPATH= @PLUGIN_RPATH@
+plugin_version= 1:0:0
 plugin_ldflags= @plugin_ldflags@
 plugin_libadd= @plugin_libadd@
 
@@ -11,25 +11,25 @@ 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
 
-libcd_linux_la_LDFLAGS=	-version-info 1:0:0 $(PLUGIN_RPATH)
+libcd_linux_la_LDFLAGS=	$(plugin_ldflags)
 libcd_linux_la_SOURCES=	cd_linux.c
 
-libcd_xmms_la_LDFLAGS=	-version-info 1:0:0 $(PLUGIN_RPATH)
+libcd_xmms_la_LDFLAGS=	$(plugin_ldflags)
 libcd_xmms_la_LIBADD=	$(XMMS_LIBS)
 libcd_xmms_la_SOURCES=	cd_xmms.c
 
-libcd_sdl_la_LDFLAGS=	$(plugin_ldflags) -version-info 1:0:0 $(PLUGIN_RPATH)
+libcd_sdl_la_LDFLAGS=	$(plugin_ldflags)
 libcd_sdl_la_LIBADD=	$(SDL_LIBS) $(plugin_libadd)
 libcd_sdl_la_SOURCES=	cd_sdl.c
 
-libcd_sgi_la_LDFLAGS=	-version-info 1:0:0 $(PLUGIN_RPATH)
+libcd_sgi_la_LDFLAGS=	$(plugin_ldflags)
 libcd_sgi_la_LIBADD=	$(SGI_CD_LIBS)
 libcd_sgi_la_SOURCES=	cd_sgi.c
 
-libcd_win_la_LDFLAGS=	$(plugin_ldflags) -version-info 1:0:0 $(PLUGIN_RPATH)
+libcd_win_la_LDFLAGS=	$(plugin_ldflags)
 libcd_win_la_LIBADD=	$(plugin_libadd)
 libcd_win_la_SOURCES=	cd_win.c
 
-libcd_null_la_LDFLAGS=	$(plugin_ldflags) -version-info 1:0:0 $(PLUGIN_RPATH)
+libcd_null_la_LDFLAGS=	$(plugin_ldflags)
 libcd_null_la_LIBADD=	$(plugin_libadd)
 libcd_null_la_SOURCES=	cd_null.c
diff --git a/libs/audio/renderer/Makefile.am b/libs/audio/renderer/Makefile.am
index 753d75565..91494a169 100644
--- a/libs/audio/renderer/Makefile.am
+++ b/libs/audio/renderer/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS= foreign
 
 INCLUDES= -I$(top_srcdir)/include
-PLUGIN_RPATH= @PLUGIN_RPATH@
+plugin_version= 1:0:0
 plugin_ldflags= @plugin_ldflags@
 plugin_libadd= @plugin_libadd@
 
@@ -18,7 +18,7 @@ noinst_LTLIBRARIES=	$(asm) @SND_REND_STATIC@
 
 libasm_la_SOURCES=	snd_mixa.S
 
-libsnd_render_default_la_LDFLAGS=	-version-info 1:0:0 $(PLUGIN_RPATH)
+libsnd_render_default_la_LDFLAGS=	$(plugin_ldflags)
 libsnd_render_default_la_SOURCES=	snd_dma.c snd_mem.c snd_mix.c
 if ASM_ARCH
 libsnd_render_default_la_LIBADD=	$(asm)
diff --git a/libs/audio/targets/Makefile.am b/libs/audio/targets/Makefile.am
index 2ac0f0dc6..50d1c36c3 100644
--- a/libs/audio/targets/Makefile.am
+++ b/libs/audio/targets/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS= foreign
 
 INCLUDES= -I$(top_srcdir)/include $(ALSA_CFLAGS) $(MME_CFLAGS) $(OSS_CFLAGS) $(SGISND_CFLAGS) $(SUNSND_CFLAGS) $(WIN32SND_CFLAGS) $(SDL_CFLAGS)
 SDL_LIBS = @SDL_LIBS@
-PLUGIN_RPATH= @PLUGIN_RPATH@
+plugin_version= 1:0:0
 plugin_ldflags= @plugin_ldflags@
 plugin_libadd= @plugin_libadd@
 
@@ -13,37 +13,37 @@ EXTRA_LTLIBRARIES= \
 	libsnd_output_oss.la libsnd_output_sgi.la libsnd_output_sun.la \
 	libsnd_output_win.la libsnd_output_null.la libsnd_output_disk.la
 
-libsnd_output_sdl_la_LDFLAGS=	$(plugin_ldflags) -version-info 1:0:0 $(PLUGIN_RPATH)
+libsnd_output_sdl_la_LDFLAGS=	$(plugin_ldflags)
 libsnd_output_sdl_la_LIBADD=	$(SDL_LIBS) $(plugin_libadd)
 libsnd_output_sdl_la_SOURCES=	snd_sdl.c
 
-libsnd_output_alsa0_5_la_LDFLAGS=	-version-info 1:0:0 $(PLUGIN_RPATH)
+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
 
-libsnd_output_alsa0_9_la_LDFLAGS=	-version-info 1:0:0 $(PLUGIN_RPATH)
+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
 
-libsnd_output_oss_la_LDFLAGS=	-version-info 1:0:0 $(PLUGIN_RPATH)
+libsnd_output_oss_la_LDFLAGS=	$(plugin_ldflags)
 libsnd_output_oss_la_LIBADD=	$(OSS_LIBS)
 libsnd_output_oss_la_SOURCES=	snd_oss.c
 
-libsnd_output_sgi_la_LDFLAGS=	-version-info 1:0:0 $(PLUGIN_RPATH)
+libsnd_output_sgi_la_LDFLAGS=	$(plugin_ldflags)
 libsnd_output_sgi_la_LIBADD=	$(SGISND_LIBS)
 libsnd_output_sgi_la_SOURCES=	snd_sgi.c
 
-libsnd_output_sun_la_LDFLAGS=	-version-info 1:0:0 $(PLUGIN_RPATH)
+libsnd_output_sun_la_LDFLAGS=	$(plugin_ldflags)
 libsnd_output_sun_la_SOURCES=	snd_sun.c
 
-libsnd_output_win_la_LDFLAGS=	$(plugin_ldflags) -version-info 1:0:0 $(PLUGIN_RPATH)
+libsnd_output_win_la_LDFLAGS=	$(plugin_ldflags)
 libsnd_output_win_la_LIBADD=	$(WINSND_LIBS) $(plugin_libadd)
 libsnd_output_win_la_SOURCES=	snd_win.c
 
-libsnd_output_disk_la_LDFLAGS=	$(plugin_ldflags) -version-info 1:0:0 $(PLUGIN_RPATH)
+libsnd_output_disk_la_LDFLAGS=	$(plugin_ldflags)
 libsnd_output_disk_la_LIBADD=	$(plugin_libadd)
 libsnd_output_disk_la_SOURCES=	snd_disk.c
 
-libsnd_output_null_la_LDFLAGS=	$(plugin_ldflags) -version-info 1:0:0 $(PLUGIN_RPATH)
+libsnd_output_null_la_LDFLAGS=	$(plugin_ldflags)
 libsnd_output_null_la_LIBADD=	$(plugin_libadd)
 libsnd_output_null_la_SOURCES=	snd_null.c
diff --git a/libs/console/Makefile.am b/libs/console/Makefile.am
index 9360c09f8..b516b05ca 100644
--- a/libs/console/Makefile.am
+++ b/libs/console/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS= foreign
 
 INCLUDES= -I$(top_srcdir)/include
-PLUGIN_RPATH= @PLUGIN_RPATH@
+plugin_version= 1:0:0
 plugin_ldflags= @plugin_ldflags@
 plugin_libadd= @plugin_libadd@
 
@@ -14,14 +14,14 @@ common_sources= buffer.c complete.c console.c inputline.c list.c filelist.c
 client_sources= client.c menu.c
 server_sources= server.c
 
-libQFconsole_la_LDFLAGS=	$(plugin_ldflags) -version-info 1:0:0
+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) -version-info 1:0:0 $(PLUGIN_RPATH)
+libconsole_client_la_LDFLAGS=	$(plugin_ldflags)
 libconsole_client_la_LIBADD=	$(plugin_libadd)
 libconsole_client_la_SOURCES=	$(client_sources)
 
-libconsole_server_la_LDFLAGS=	$(plugin_ldflags) -version-info 1:0:0 $(PLUGIN_RPATH)
+libconsole_server_la_LDFLAGS=	$(plugin_ldflags)
 libconsole_server_la_LIBADD=	$(CURSES_LIBS) $(plugin_libadd)
 libconsole_server_la_SOURCES=	$(server_sources)