diff --git a/CREDITS b/CREDITS
index c6e9f577..e13034c4 100644
--- a/CREDITS
+++ b/CREDITS
@@ -146,3 +146,6 @@ Gareth Potter
 Anton Johansson
  * Swedish Translations
 
+Iam Burrell
+ * configure patches to put plugins in libdir
+ * RH/Centos/Fedora specfiles
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index f6161691..b184ba11 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -7,12 +7,13 @@ EXTRA_DIST = README mt-daapd.spec mt-daapd.conf.templ mt-daapd-ssc.sh mt-daapd-s
 BUILT_SOURCES = mt-daapd.conf
 bin_SCRIPTS = mt-daapd-ssc.sh
 
-dbdir="/var/cache/mt-daapd"
+dbdir="$(localstatedir)/cache/mt-daapd"
 
 mt-daapd.conf: mt-daapd.conf.templ ../config.h
-	if [ "$(prefix)" = "/usr" ]; then \
-		sed -e s,[@]prefix[@],$(prefix),g -e s,[@]dbdir[@],/var/cache/mt-daapd,g mt-daapd.conf.templ >$@; \
-	else \
-		sed -e s,[@]prefix[@],$(prefix),g -e s,[@]dbdir[@],$(prefix)/var/cache/mt-daapd,g  mt-daapd.conf.templ >$@; \
-	fi
+	sed -e s,[@]prefix[@],$(prefix), \
+		-e s,[@]sysconfdir[@],$(sysconfdir), \
+		-e s,[@]libdir[@],$(libdir), \
+		-e s,[@]dbdir[@],$(dbdir),g mt-daapd.conf.templ >$@
+
+
 
diff --git a/contrib/mt-daapd.conf.templ b/contrib/mt-daapd.conf.templ
index 163400c6..edc963bf 100644
--- a/contrib/mt-daapd.conf.templ
+++ b/contrib/mt-daapd.conf.templ
@@ -114,7 +114,7 @@ runas = nobody
 # below.
 #
 
-playlist = @prefix@/etc/mt-daapd.playlist
+playlist = @sysconfdir@/mt-daapd.playlist
 
 #
 # password (optional)
@@ -295,6 +295,6 @@ scan_type = 2
 #compress = 0
 
 [plugins]
-plugin_dir = @prefix@/share/mt-daapd/plugins
+plugin_dir = @libdir@/mt-daapd/plugins
 
 
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index b809e22f..22abbed9 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -1,9 +1,9 @@
 # $Id: $
 #
-rspdir = ${pkgdatadir}/plugins
-out_daapdir = ${pkgdatadir}/plugins
-ssc_ffmpegdir = ${pkgdatadir}/plugins
-ssc_scriptdir = ${pkgdatadir}/plugins
+rspdir = ${pkglibdir}/plugins
+out_daapdir = ${pkglibdir}/plugins
+ssc_ffmpegdir = ${pkglibdir}/plugins
+ssc_scriptdir = ${pkglibdir}/plugins
 
 rsp_LTLIBRARIES=rsp.la
 rsp_la_LDFLAGS=-module -avoid-version