diff --git a/README b/README
index ab93b34f..bdc7a282 100644
--- a/README
+++ b/README
@@ -114,12 +114,9 @@ crashes when built with this option you will have to go back and
 configure without --enable-sse.  Note that
 --disable-asm-optimizations implies --disable-sse.
 
---enable-3dnow : If you are building for an AMD CPU which has 3DNOW!
-support, you can use this flag to enable some assembly routines
-which use 3DNOW! instructions.  There have been some reports that
-they may cause flac to crash, which is why it is not turned on
-by default.  Note that --disable-asm-optimizations overrides
---enable-3dnow.
+--enable-local-xmms-plugin : Installs the FLAC XMMS plugin in
+$HOME/.xmms/Plugins, instead of the global XMMS plugin area
+(usually /usr/lib/xmms/Input).
 
 --with-ogg=
 --with-id3lib=
diff --git a/configure.in b/configure.in
index 68b2d7ab..647a6f6c 100644
--- a/configure.in
+++ b/configure.in
@@ -208,6 +208,15 @@ if test x$use_3dnow = xtrue ; then
 AC_DEFINE(FLAC__USE_3DNOW)
 fi
 
+AC_ARG_ENABLE(local-xmms-plugin,
+[  --enable-local-xmms-plugin     Install XMMS plugin to ~/.xmms/Plugins instead of system location],
+[case "${enableval}" in
+	yes) install_xmms_plugin_locally=true ;;
+	no)  install_xmms_plugin_locally=false ;;
+	*) AC_MSG_ERROR(bad value ${enableval} for --enable-local-xmms-plugin) ;;
+esac],[install_xmms_plugin_locally=false])
+AM_CONDITIONAL(FLaC__INSTALL_XMMS_PLUGIN_LOCALLY, test x$install_xmms_plugin_locally = xtrue)
+
 AC_ARG_ENABLE(exhaustive-tests,
 [  --enable-exhaustive-tests      Enable exhaustive testing],
 [case "${enableval}" in
diff --git a/src/plugin_xmms/Makefile.am b/src/plugin_xmms/Makefile.am
index 1aa6b5d2..651ac218 100644
--- a/src/plugin_xmms/Makefile.am
+++ b/src/plugin_xmms/Makefile.am
@@ -29,7 +29,11 @@ noinst_HEADERS = \
 
 CFLAGS = @CFLAGS@ @ID3LIB_CFLAGS@ @XMMS_CFLAGS@
 INCLUDES = -I$(top_srcdir)/src
+if FLaC__INSTALL_XMMS_PLUGIN_LOCALLY
+xmmsinputplugindir = $(HOME)/.xmms/Plugins
+else
 xmmsinputplugindir = @XMMS_INPUT_PLUGIN_DIR@
+endif
 
 # Don't build a static library
 LIBTOOL = $(top_builddir)/libtool-disable-static