diff --git a/configure.ac b/configure.ac
index 0ddbcc690..5137c694c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1544,6 +1544,7 @@ else
 	SOUND_TYPES=""
 fi
 
+PLUGIN_RPATH='-rpath $(plugindir)'
 CD_PLUGIN_STATIC=""
 SND_PLUGIN_STATIC=""
 SND_REND_STATIC=""
@@ -1555,6 +1556,7 @@ if test "x$static_plugins" = xauto -a "x$SYSTYPE" = xWIN32; then
 	static_plugins=yes
 fi
 if test "x$static_plugins" = xyes; then
+	PLUGIN_RPATH=''
 	CD_PLUGIN_STATIC="$CD_PLUGIN_TARGETS"
 	CD_PLUGIN_TARGETS=""
 	SND_PLUGIN_STATIC="$SND_PLUGIN_TARGETS"
diff --git a/libs/audio/cd/Makefile.am b/libs/audio/cd/Makefile.am
index 888377255..d6449908e 100644
--- a/libs/audio/cd/Makefile.am
+++ b/libs/audio/cd/Makefile.am
@@ -1,31 +1,31 @@
 INCLUDES= -I$(top_srcdir)/include $(SDL_CFLAGS) $(XMMS_CFLAGS)
-SDL_LIBS = @SDL_LIBS@
-XMMS_LIBS = @XMMS_LIBS@
-
+SDL_LIBS= @SDL_LIBS@
+XMMS_LIBS= @XMMS_LIBS@
+PLUGIN_RPATH= @PLUGIN_RPATH@
 
 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 -rpath $(plugindir)
+libcd_linux_la_LDFLAGS=	-version-info 1:0:0 $(PLUGIN_RPATH)
 libcd_linux_la_SOURCES=	cd_linux.c
 
-libcd_xmms_la_LDFLAGS=	-version-info 1:0:0 -rpath $(plugindir)
+libcd_xmms_la_LDFLAGS=	-version-info 1:0:0 $(PLUGIN_RPATH)
 libcd_xmms_la_LIBADD=	$(XMMS_LIBS)
 libcd_xmms_la_SOURCES=	cd_xmms.c
 
-libcd_sdl_la_LDFLAGS=	$(plugin_LDFLAGS) -version-info 1:0:0 -rpath $(plugindir)
+libcd_sdl_la_LDFLAGS=	$(plugin_LDFLAGS) -version-info 1:0:0 $(PLUGIN_RPATH)
 libcd_sdl_la_LIBADD=	$(SDL_LIBS) $(plugin_LIBADD)
 libcd_sdl_la_SOURCES=	cd_sdl.c
 
-libcd_sgi_la_LDFLAGS=	-version-info 1:0:0 -rpath $(plugindir)
+libcd_sgi_la_LDFLAGS=	-version-info 1:0:0 $(PLUGIN_RPATH)
 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 -rpath $(plugindir)
+libcd_win_la_LDFLAGS=	$(plugin_LDFLAGS) -version-info 1:0:0 $(PLUGIN_RPATH)
 libcd_win_la_LIBADD=	$(plugin_LIBADD)
 libcd_win_la_SOURCES=	cd_win.c
 
-libcd_null_la_LDFLAGS=	$(plugin_LDFLAGS) -version-info 1:0:0 -rpath $(plugindir)
+libcd_null_la_LDFLAGS=	$(plugin_LDFLAGS) -version-info 1:0:0 $(PLUGIN_RPATH)
 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 e0b5441be..20d7ee517 100644
--- a/libs/audio/renderer/Makefile.am
+++ b/libs/audio/renderer/Makefile.am
@@ -1,4 +1,5 @@
 INCLUDES= -I$(top_srcdir)/include
+PLUGIN_RPATH= @PLUGIN_RPATH@
 
 plugin_LTLIBRARIES=	@SND_REND_TARGETS@
 EXTRA_LTLIBRARIES=	libsnd_render_default.la
@@ -13,7 +14,7 @@ noinst_LTLIBRARIES=	$(asm) @SND_REND_STATIC@
 
 libasm_la_SOURCES=	snd_mixa.S
 
-libsnd_render_default_la_LDFLAGS=	-version-info 1:0:0 -rpath $(plugindir)
+libsnd_render_default_la_LDFLAGS=	-version-info 1:0:0 $(PLUGIN_RPATH)
 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 f9ac1bc94..91fa7d0d3 100644
--- a/libs/audio/targets/Makefile.am
+++ b/libs/audio/targets/Makefile.am
@@ -1,41 +1,42 @@
 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_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
 
-libsnd_output_sdl_la_LDFLAGS=	$(plugin_LDFLAGS) -version-info 1:0:0 -rpath $(plugindir)
+libsnd_output_sdl_la_LDFLAGS=	$(plugin_LDFLAGS) -version-info 1:0:0 $(PLUGIN_RPATH)
 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 -rpath $(plugindir)
+libsnd_output_alsa0_5_la_LDFLAGS=	-version-info 1:0:0 $(PLUGIN_RPATH)
 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 -rpath $(plugindir)
+libsnd_output_alsa0_9_la_LDFLAGS=	-version-info 1:0:0 $(PLUGIN_RPATH)
 libsnd_output_alsa0_9_la_LIBADD=	$(ALSA_LIBS)
 libsnd_output_alsa0_9_la_SOURCES=	snd_alsa_0_9.c
 
-libsnd_output_oss_la_LDFLAGS=	-version-info 1:0:0 -rpath $(plugindir)
+libsnd_output_oss_la_LDFLAGS=	-version-info 1:0:0 $(PLUGIN_RPATH)
 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 -rpath $(plugindir)
+libsnd_output_sgi_la_LDFLAGS=	-version-info 1:0:0 $(PLUGIN_RPATH)
 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 -rpath $(plugindir)
+libsnd_output_sun_la_LDFLAGS=	-version-info 1:0:0 $(PLUGIN_RPATH)
 libsnd_output_sun_la_SOURCES=	snd_sun.c
 
-libsnd_output_win_la_LDFLAGS=	$(plugin_LDFLAGS) -version-info 1:0:0 -rpath $(plugindir)
+libsnd_output_win_la_LDFLAGS=	$(plugin_LDFLAGS) -version-info 1:0:0 $(PLUGIN_RPATH)
 libsnd_output_win_la_LIBADD=	$(WINSND_LIBS) $(plugin_LIBADD)
 libsnd_output_win_la_SOURCES=	snd_win.c
 
-libsnd_output_disk_la_LDFLAGS=	$(plugin_LDFLAGS) -verison-info 1:0:0 -rpath $(plugindir)
+libsnd_output_disk_la_LDFLAGS=	$(plugin_LDFLAGS) -verison-info 1:0:0 $(PLUGIN_RPATH)
 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 -rpath $(plugindir)
+libsnd_output_null_la_LDFLAGS=	$(plugin_LDFLAGS) -version-info 1:0:0 $(PLUGIN_RPATH)
 libsnd_output_null_la_LIBADD=	$(plugin_LIBADD)
 libsnd_output_null_la_SOURCES=	snd_null.c