diff --git a/RPM/quakeforge.spec.in b/RPM/quakeforge.spec.in
index 1bc21d44f..ae6271fe8 100644
--- a/RPM/quakeforge.spec.in
+++ b/RPM/quakeforge.spec.in
@@ -303,11 +303,11 @@ 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/cd_linux.so*
+%attr(-,root,root) %{_prefix}/lib/quakeforge/console_client.so*
+%attr(-,root,root) %{_prefix}/lib/quakeforge/snd_output_disk.so*
+%attr(-,root,root) %{_prefix}/lib/quakeforge/snd_render_default.so*
 %attr(-,root,root) %{fs_sharepath}/QF/menu.dat*
-%attr(-,root,root) %{fs_sharepath}/QF/plugins/cd_linux.so*
-%attr(-,root,root) %{fs_sharepath}/QF/plugins/console_client.so*
-%attr(-,root,root) %{fs_sharepath}/QF/plugins/snd_output_disk.so*
-%attr(-,root,root) %{fs_sharepath}/QF/plugins/snd_render_default.so*
 
 %files devel
 %attr(-,root,root)	%{_prefix}/lib/libQFcd.*a
@@ -363,7 +363,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(-,root,root)	%{_prefix}/bin/qw-server
 %attr(-,root,root)	%{_prefix}/bin/nq-server
 %attr(-,root,root)	%{_prefix}/bin/qw-master
-%attr(-,root,root)	%{fs_sharepath}/QF/plugins/console_server.so*
+#%attr(-,root,root)	%{_prefix}/bin/hw-master
+%attr(-,root,root)	%{_prefix}/lib/quakeforge/console_server.so*
 
 %if "%{HAVE_X11}"=="'yes'"
 %files glx
@@ -395,12 +396,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %if "%{HAVE_ALSA}"=="'yes'"
 %files alsa
-%attr(-,root,root)	%{fs_sharepath}/QF/plugins/snd_output_alsa0_9.so*
+%attr(-,root,root)	%{_prefix}/lib/quakeforge/snd_output_alsa0_9.so*
 %endif
 
 %if "%{HAVE_OSS}"=="'yes'"
 %files oss
-%attr(-,root,root)	%{fs_sharepath}/QF/plugins/snd_output_oss.so*
+%attr(-,root,root)	%{_prefix}/lib/quakeforge/snd_output_oss.so*
 %endif
 
 %files -n qfcc
diff --git a/configure.ac b/configure.ac
index fe62ab737..35448db50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1179,10 +1179,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
-                          \${sharepath}/QF/plugins],
+                          \${libdir}/quakeforge],
 plugindir=$withval, plugindir="auto")
 
-PLUGINDIR="\${sharepath}/QF/plugins"
+PLUGINDIR="\${libdir}/quakeforge"
 if test "x$plugindir" = "xauto" -o "x$plugindir" = "xyes" -o "x$plugindir" = "x"; then
 	plugindir="$PLUGINDIR"
 elif test "x$plugindir" = xno; then