diff --git a/.gitignore b/.gitignore
index ba1877f..4e8524e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,4 @@ pcp-3.3.3-1.src.tar.gz
 /pcp-3.10.7-0.20150810gitad91613.tar.gz
 /pcp-3.10.7-0.20150818git063cfd3.tar.gz
 /pcp-3.10.7-0.20150824gita4f06ab.tar.gz
+/pcp-3.10.7-0.20150831gita27cca8.tar.gz
diff --git a/pcp.spec b/pcp.spec
index 4b9b69f..36eb4db 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -3,11 +3,11 @@ Name: pcp
 Version: 3.10.7
 %global buildversion 0
 
-Release: 0.20150824gita4f06ab%{?dist}
+Release: 0.20150831gita27cca8%{?dist}
 License: GPLv2+ and LGPLv2.1+ and CC-BY
 URL: http://www.pcp.io
 Group: Applications/System
-Source0: %{name}-%{version}-0.20150824gita4f06ab.tar.gz
+Source0: %{name}-%{version}-0.20150831gita27cca8.tar.gz
 Source1: pcp-webjs.src.tar.gz
 
 # Compat check for distros that already have single install pmda's
@@ -1774,7 +1774,7 @@ save_configs_script()
         [ "$_dir" = "$_new" ] && continue
         if [ -d "$_dir" ]
         then
-            ( cd "$_dir" ; find . -type f -print ) | sed -e 's/^\.\///' \
+            ( cd "$_dir" ; find . -maxdepth 1 -type f ) | sed -e 's/^\.\///' \
             | while read _file
             do
                 [ "$_file" = "control" ] && continue
@@ -1802,7 +1802,7 @@ done
 for daemon in pmcd pmproxy
 do
     save_configs_script >> "$PCP_LOG_DIR/configs.sh" "$PCP_SYSCONF_DIR/$daemon"\
-        "$PCP_CONFIG_DIR/$daemon" /etc/$daemon /etc/sysconfig/$daemon
+        "$PCP_CONFIG_DIR/$daemon" /etc/$daemon
 done
 exit 0
 
@@ -2004,6 +2004,9 @@ cd
 %config(noreplace) %{_sysconfdir}/sasl2/pmcd.conf
 %config(noreplace) %{_sysconfdir}/cron.d/pcp-pmlogger
 %config(noreplace) %{_sysconfdir}/cron.d/pcp-pmie
+%config(noreplace) %{_sysconfdir}/sysconfig/pmlogger
+%config(noreplace) %{_sysconfdir}/sysconfig/pmproxy
+%config(noreplace) %{_sysconfdir}/sysconfig/pmcd
 %config %{_sysconfdir}/bash_completion.d/pcp
 %config %{_sysconfdir}/pcp.env
 %config %{_sysconfdir}/pcp.sh
@@ -2014,9 +2017,13 @@ cd
 %dir %{_confdir}/pmproxy
 %config(noreplace) %{_confdir}/pmproxy/pmproxy.options
 %dir %{_confdir}/pmie
+%dir %{_confdir}/pmie/control.d
 %config(noreplace) %{_confdir}/pmie/control
+%config(noreplace) %{_confdir}/pmie/control.d/local
 %dir %{_confdir}/pmlogger
+%dir %{_confdir}/pmlogger/control.d
 %config(noreplace) %{_confdir}/pmlogger/control
+%config(noreplace) %{_confdir}/pmlogger/control.d/local
 
 %{_localstatedir}/lib/pcp/config/pmafm
 %dir %attr(0775,pcp,pcp) %{_localstatedir}/lib/pcp/config/pmie
@@ -2354,6 +2361,10 @@ cd
 %endif
 
 %changelog
+* Mon Aug 31 2015 Lukas Berk <lberk@redhat.com> - 3.10.7-0.20150831gita27cca8
+- Automated weekly rawhide release
+- Applied spec changes from upstream git
+
 * Mon Aug 24 2015 Lukas Berk <lberk@redhat.com> - 3.10.7-0.20150824gita4f06ab
 - Automated weekly rawhide release
 
diff --git a/sources b/sources
index 5792c28..da7f957 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-78d872eb4ba197d45394b2fa02a7e925  pcp-3.10.7-0.20150824gita4f06ab.tar.gz
-dc8f25e48371121a24c84eb6f7ec5646  pcp-webjs.src.tar.gz
+d987a3c31bbf8591b812c03ad86f6781  pcp-3.10.7-0.20150831gita27cca8.tar.gz
+4e5092c397d511b8fa15e5c766a9f68e  pcp-webjs.src.tar.gz