diff --git a/bacula.spec b/bacula.spec
index f72594a..d75c59d 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -3,7 +3,7 @@
 
 Name:                   bacula
 Version:                5.2.10
-Release:                5%{?dist}
+Release:                6%{?dist}
 Summary:                Cross platform network backup for Linux, Unix, Mac and Windows
 # See LICENSE for details
 License:                AGPLv3 with exceptions
@@ -303,12 +303,6 @@ export CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses"
 export CPPFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses"
 %configure \
         --sysconfdir=%{_sysconfdir}/bacula \
-        --with-dir-user=bacula \
-        --with-dir-group=bacula \
-        --with-sd-user=bacula \
-        --with-sd-group=disk \
-        --with-fd-user=root \
-        --with-fd-group=root \
         --with-hostname=localhost \
         --with-basename=bacula \
         --with-dir-password=@@DIR_PASSWORD@@ \
@@ -381,7 +375,7 @@ rm -f %{buildroot}%{_libdir}/libbaccats.so
 rm -f %{buildroot}%{_libdir}/libbaccats-%{version}.so
 
 # Sample query file
-install -p -m 640 -D examples/sample-query.sql %{buildroot}%{_sysconfdir}/bacula/query.sql
+mv %{buildroot}%{_libexecdir}/bacula/query.sql %{buildroot}%{_sysconfdir}/bacula/query.sql
 
 %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
 # Bat
@@ -769,7 +763,7 @@ fi
 %{_sbindir}/bls
 %{_sbindir}/bscan
 %{_sbindir}/btape
-%config(noreplace) %{_sysconfdir}/bacula/bacula-sd.conf
+%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bacula-sd.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/bacula-sd
 %if 0%{?fedora} >= 15 || 0%{?rhel} > 6
 %{_unitdir}/bacula-sd.service
@@ -795,7 +789,7 @@ fi
 %else
 %{_initrddir}/bacula-fd
 %endif
-%config(noreplace) %{_sysconfdir}/bacula/bacula-fd.conf
+%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bacula-fd.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/bacula-fd
 %{_mandir}/man8/bacula-fd.8.*
 %{_libdir}/bacula/bpipe-fd.so
@@ -843,6 +837,11 @@ fi
 
 
 %changelog
+* Wed Aug 29 2012 Simone Caronni <negativo17@gmail.com> - 5.2.10-6
+- Remove user definition during prep so they are not used during the install
+  phase (rhbz#852732).
+- Enforce permissions in default config files.
+
 * Fri Jul 20 2012 Simone Caronni <negativo17@gmail.com> - 5.2.10-5
 - Removed make_catalog_backup bash script, leave only the default perl one (rhbz#456612,665498).