diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 8d4c1d8..7d713cf 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -2,15 +2,15 @@ Name: cyrus-imapd
 Version: 2.5.10
 Release: 1%{?dist}
 
-%define ssl_pem_file %{_sysconfdir}/pki/%{name}/%{name}.pem
+%define ssl_pem_file /etc/pki/%{name}/%{name}.pem
 
 # uid/gid reserved, see setup:/usr/share/doc/setup*/uidgid
 %define uid 76
 %define gid 76
 
-%define _cyrususer cyrus
-%define _cyrusgroup mail
-%define _cyrexecdir %{_exec_prefix}/lib/%{name}
+%define cyrususer cyrus
+%define cyrusgroup mail
+%define cyrexecdir %{_prefix}/lib/%{name}
 
 Summary: A high-performance mail server with IMAP, POP3, NNTP and SIEVE support
 License: BSD
@@ -38,15 +38,11 @@ Source13: cyr_systemd_helper
 
 #Patch4: cyrus-imapd-2.3.18-potential-overflow.patch
 
-BuildRequires: autoconf
-BuildRequires: cyrus-sasl-devel, perl-devel, perl-generators, tcp_wrappers
-BuildRequires: perl(Pod::Html)
-BuildRequires: libdb-devel, openssl-devel, pkgconfig
-BuildRequires: flex, bison, groff, automake
-BuildRequires: openldap-devel
-BuildRequires: krb5-devel
-BuildRequires: net-snmp-devel
-BuildRequires: transfig
+BuildRequires: autoconf automake bison flex groff libtool pkgconfig transfig
+BuildRequires: perl-devel perl-generators perl(Pod::Html) tcp_wrappers
+BuildRequires: cyrus-sasl-devel jansson-devel krb5-devel
+BuildRequires: libical-devel libxml2-devel net-snmp-devel openldap-devel
+BuildRequires: openssl-devel sqlite-devel
 
 Requires(post):   e2fsprogs, perl, grep, coreutils, findutils, systemd-units
 Requires(preun):  systemd-units, coreutils
@@ -111,65 +107,67 @@ one running the server.
 install -m 644 %{SOURCE11} doc/
 
 # Modify docs master --> cyrus-master
-%{__perl} -pi -e "s@master\(8\)@cyrus-master(8)@" man/*5 man/*8 lib/imapoptions
+perl -pi -e "s@master\(8\)@cyrus-master(8)@" man/*5 man/*8 lib/imapoptions
 sed -i -e 's|\([^-]\)master|\1cyrus-master|g;s|^master|cyrus-master|g;s|Master|Cyrus-master|g;s|MASTER|CYRUS-MASTER|g' \
         man/master.8 doc/man.html
 
 # Modify path in perl scripts
-find . -type f -name "*.pl" | xargs %{__perl} -pi -e "s@/usr/local/bin/perl@%{__perl}@"
+find . -type f -name "*.pl" | xargs perl -pi -e "s@/usr/local/bin/perl@%{__perl}@"
 
 # modify lmtp socket path in .conf files
-%{__perl} -pi -e "s@/var/imap/@%{_var}/lib/imap/@" master/conf/*.conf doc/cyrusv2.mc
+perl -pi -e "s@/var/imap/@/var/lib/imap/@" master/conf/*.conf doc/cyrusv2.mc
 
 # enable idled in .conf files to prevent error messages
-%{__perl} -pi -e "s/#  idled/  idled/" master/conf/*.conf
+#perl -pi -e "s/#  idled/  idled/" master/conf/*.conf
 
 # Fix permissions on perl programs
 find . -type f -name "*.pl" -exec chmod 755 {} \;
 
 %build
-#automake -a -f -c || :
-#aclocal -I cmulocal
-#autoheader
-#autoconf -
-
-CPPFLAGS="${__global_cflags} -I%{_includedir}/et -I%{_includedir}/kerberosIV -fno-strict-aliasing"; export CPPFLAGS
-CFLAGS="%{__global_cflags} -fno-strict-aliasing"; export CFLAGS
-CCDLFLAGS="-rdynamic"; export CCDLFLAGS
-LDFLAGS="-Wl,-z,now -Wl,-z,relro"
-%ifnarch ppc ppc64
-LDFLAGS="$LDFLAGS -pie"; export LDFLAGS
-%endif
-
+#CPPFLAGS="${__global_cflags} -I%{_includedir}/et -I%{_includedir}/kerberosIV -fno-strict-aliasing"; export CPPFLAGS
+#CFLAGS="%{__global_cflags} -fno-strict-aliasing"; export CFLAGS
+#CCDLFLAGS="-rdynamic"; export CCDLFLAGS
+#LDFLAGS="-Wl,-z,now -Wl,-z,relro"
+#%ifnarch ppc ppc64
+#LDFLAGS="$LDFLAGS -pie"; export LDFLAGS
+#%endif
+
+autoreconf -vi
 %{configure} \
-  --enable-netscapehack \
-  --enable-listext \
-  --enable-idled \
-  --with-ldap=/usr \
-  --with-snmp \
-  --enable-murder \
-  --enable-replication \
-  --enable-nntp \
-  --with-perl=%{__perl} \
-  --with-cyrus-prefix=%{_cyrexecdir} \
-  --with-service-path=%{_cyrexecdir} \
-  --with-bdb-incdir=%{_includedir}/libdb \
-  --with-extraident="Fedora-RPM-%{version}-%{release}" \
-  --with-syslogfacility=MAIL \
-  --with-krbimpl=mit
-
-make -C man -f Makefile.dist
-make -C doc -f Makefile.dist
-make LDFLAGS="$LDFLAGS -pie %{__global_ldflags}"
-make -C notifyd notifytest
+    --with-bdb-incdir=%{_includedir}/libdb \
+    --with-cyrus-prefix=%{cyrexecdir} \
+    --with-extraident="Fedora-RPM-%{version}-%{release}" \
+    --with-krbimpl=mit \
+    --with-ldap=/usr \
+    --with-perl=%{__perl} \
+    --with-service-path=%{cyrexecdir} \
+    --with-snmp \
+    --with-syslogfacility=MAIL \
+    --enable-autocreate \
+    --enable-http \
+    --enable-idled \
+    --enable-listext \
+    --enable-murder \
+    --enable-netscapehack \
+    --enable-nntp \
+    --enable-replication \
+    --enable-unit-tests \
+
+%undefine smp_mflags
+%make_build
+
+#make -C man -f Makefile.dist
+#make -C doc -f Makefile.dist
+#make LDFLAGS="$LDFLAGS -pie %{__global_ldflags}"
+#make -C notifyd notifytest
 
 %install
 # This is needed to install the perl files correctly
 pushd perl/imap
-  %{__perl} Makefile.PL PREFIX=%{buildroot}%{_prefix} INSTALLDIRS=vendor
+  perl Makefile.PL PREFIX=%{buildroot}%{_prefix} INSTALLDIRS=vendor
 popd
 pushd perl/sieve/managesieve
-  %{__perl} Makefile.PL PREFIX=%{buildroot}%{_prefix} INSTALLDIRS=vendor
+  perl Makefile.PL PREFIX=%{buildroot}%{_prefix} INSTALLDIRS=vendor
 popd
 
 # Do what the regular make install does
@@ -182,38 +180,38 @@ install -m 755 perl/imap/cyradm    %{buildroot}%{_bindir}/
 
 # Install tools
 for tool in tools/* ; do
-  test -f ${tool} && install -m 755 ${tool} %{buildroot}%{_cyrexecdir}/
+  test -f ${tool} && install -m 755 ${tool} %{buildroot}%{cyrexecdir}/
 done
 
 # Create directories
 install -d \
-  %{buildroot}%{_sysconfdir}/{rc.d/init.d,logrotate.d,pam.d,sysconfig,cron.daily} \
+  %{buildroot}/etc/{rc.d/init.d,logrotate.d,pam.d,sysconfig,cron.daily} \
   %{buildroot}%{_libdir}/sasl \
   %{buildroot}%{_var}/spool/imap \
   %{buildroot}%{_var}/lib/imap/{user,quota,proc,log,msg,socket,db,sieve,sync,md5,rpm,backup,meta} \
   %{buildroot}%{_var}/lib/imap/ptclient \
   %{buildroot}%{_datadir}/%{name}/rpm \
-  %{buildroot}%{_sysconfdir}/pki/%{name} \
+  %{buildroot}/etc/pki/%{name} \
   doc/contrib
 
 # Install additional files
-install -m 755 %{SOURCE8}   %{buildroot}%{_cyrexecdir}/cvt_cyrusdb_all
+install -m 755 %{SOURCE8}   %{buildroot}%{cyrexecdir}/cvt_cyrusdb_all
 install -m 644 %{SOURCE9}   %{buildroot}%{_datadir}/%{name}/rpm/magic
-install -p -m 644 master/conf/prefork.conf %{buildroot}%{_sysconfdir}/cyrus.conf
-install -p -m 644 %{SOURCE2}    %{buildroot}%{_sysconfdir}/imapd.conf
-install -p -m 644 %{SOURCE3}    %{buildroot}%{_sysconfdir}/pam.d/pop
-install -p -m 644 %{SOURCE3}    %{buildroot}%{_sysconfdir}/pam.d/imap
-install -p -m 644 %{SOURCE3}    %{buildroot}%{_sysconfdir}/pam.d/sieve
-install -p -m 644 %{SOURCE3}    %{buildroot}%{_sysconfdir}/pam.d/mupdate
-install -p -m 644 %{SOURCE3}    %{buildroot}%{_sysconfdir}/pam.d/lmtp
-install -p -m 644 %{SOURCE3}    %{buildroot}%{_sysconfdir}/pam.d/nntp
-install -p -m 644 %{SOURCE3}    %{buildroot}%{_sysconfdir}/pam.d/csync
-install -p -m 644 %{SOURCE1}    %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
-install -p -m 644 %{SOURCE7}   %{buildroot}%{_sysconfdir}/sysconfig/%{name}
-install -p -m 755 %{SOURCE10}   %{buildroot}%{_sysconfdir}/cron.daily/%{name}
+install -p -m 644 master/conf/prefork.conf %{buildroot}/etc/cyrus.conf
+install -p -m 644 %{SOURCE2}    %{buildroot}/etc/imapd.conf
+install -p -m 644 %{SOURCE3}    %{buildroot}/etc/pam.d/pop
+install -p -m 644 %{SOURCE3}    %{buildroot}/etc/pam.d/imap
+install -p -m 644 %{SOURCE3}    %{buildroot}/etc/pam.d/sieve
+install -p -m 644 %{SOURCE3}    %{buildroot}/etc/pam.d/mupdate
+install -p -m 644 %{SOURCE3}    %{buildroot}/etc/pam.d/lmtp
+install -p -m 644 %{SOURCE3}    %{buildroot}/etc/pam.d/nntp
+install -p -m 644 %{SOURCE3}    %{buildroot}/etc/pam.d/csync
+install -p -m 644 %{SOURCE1}    %{buildroot}/etc/logrotate.d/%{name}
+install -p -m 644 %{SOURCE7}   %{buildroot}/etc/sysconfig/%{name}
+install -p -m 755 %{SOURCE10}   %{buildroot}/etc/cron.daily/%{name}
 
 install -p -D -m 644 %{SOURCE12}   %{buildroot}%{_unitdir}/cyrus-imapd.service
-install -p -D -m 755 %{SOURCE13}   %{buildroot}%{_cyrexecdir}/cyr_systemd_helper
+install -p -D -m 755 %{SOURCE13}   %{buildroot}%{cyrexecdir}/cyr_systemd_helper
 
 # Cleanup of doc dir
 find doc perl -name CVS -type d -prune -exec rm -rf {} \;
@@ -243,11 +241,11 @@ install -m 644 master/conf/*.conf doc/conf/
 touch %{buildroot}%{ssl_pem_file}
 
 # Rename 'master' binary and manpage to avoid clash with postfix
-mv -f %{buildroot}%{_cyrexecdir}/master         %{buildroot}%{_cyrexecdir}/cyrus-master
+mv -f %{buildroot}%{cyrexecdir}/master         %{buildroot}%{cyrexecdir}/cyrus-master
 mv -f %{buildroot}%{_mandir}/man8/master.8      %{buildroot}%{_mandir}/man8/cyrus-master.8
 
 # Rename 'fetchnews' binary and manpage to avoid clash with leafnode
-mv -f %{buildroot}%{_cyrexecdir}/fetchnews      %{buildroot}%{_cyrexecdir}/cyrfetchnews
+mv -f %{buildroot}%{cyrexecdir}/fetchnews      %{buildroot}%{cyrexecdir}/cyrfetchnews
 mv -f %{buildroot}%{_mandir}/man8/fetchnews.8   %{buildroot}%{_mandir}/man8/cyrfetchnews.8
 %{__perl} -pi -e 's|fetchnews|cyrfetchnews|g;s|Fetchnews|Cyrfetchnews|g;s/FETCHNEWS/CYRFETCHNEWS/g' \
         %{buildroot}%{_mandir}/man8/cyrfetchnews.8
@@ -259,10 +257,10 @@ do
 done
 
 # Remove installed but not packaged files
-rm -f %{buildroot}%{_cyrexecdir}/not-mkdep
-rm -f %{buildroot}%{_cyrexecdir}/config2header*
-rm -f %{buildroot}%{_cyrexecdir}/config2man
-rm -f %{buildroot}%{_cyrexecdir}/pop3proxyd
+rm -f %{buildroot}%{cyrexecdir}/not-mkdep
+rm -f %{buildroot}%{cyrexecdir}/config2header*
+rm -f %{buildroot}%{cyrexecdir}/config2man
+rm -f %{buildroot}%{cyrexecdir}/pop3proxyd
 find %{buildroot} -name "perllocal.pod" -exec rm -f {} \;
 find %{buildroot} -name ".packlist" -exec rm -f {} \;
 rm -f %{buildroot}%{_mandir}/man8/syncnews.8*
@@ -272,8 +270,8 @@ find %{buildroot}%{perl_vendorarch} -name "*.bs" -exec rm -f {} \;
 %pre
 # Create 'cyrus' user on target host
 getent group saslauth >/dev/null || /usr/sbin/groupadd -g %{gid} -r saslauth
-getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d %{_var}/lib/imap -g %{_cyrusgroup} \
-  -G saslauth -s /sbin/nologin -u %{uid} -r %{_cyrususer}
+getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d %{_var}/lib/imap -g %{cyrusgroup} \
+  -G saslauth -s /sbin/nologin -u %{uid} -r %{cyrususer}
 
 %post
 
@@ -289,7 +287,7 @@ done
 exec > /dev/null 2> /dev/null
 
 if [ ! -f %{ssl_pem_file} ]; then
-pushd %{_sysconfdir}/pki/tls/certs
+pushd /etc/pki/tls/certs
 umask 077
 cat << EOF | make %{name}.pem
 --
@@ -300,7 +298,7 @@ SomeOrganizationalUnit
 localhost.localdomain
 root@localhost.localdomain
 EOF
-chown root.%{_cyrusgroup} %{name}.pem
+chown root.%{cyrusgroup} %{name}.pem
 chmod 640 %{name}.pem
 mv %{name}.pem %{ssl_pem_file}
 popd
@@ -317,101 +315,101 @@ fi
 %files
 %license COPYRIGHT
 %doc README doc/*
-%config(noreplace) %{_sysconfdir}/cyrus.conf
-%config(noreplace) %{_sysconfdir}/imapd.conf
-%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
-%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%config(noreplace) %{_sysconfdir}/pam.d/pop
-%config(noreplace) %{_sysconfdir}/pam.d/imap
-%config(noreplace) %{_sysconfdir}/pam.d/sieve
-%config(noreplace) %{_sysconfdir}/pam.d/lmtp
-%config(noreplace) %{_sysconfdir}/pam.d/mupdate
-%config(noreplace) %{_sysconfdir}/pam.d/csync
-%config(noreplace) %{_sysconfdir}/pam.d/nntp
-%{_sysconfdir}/cron.daily/%{name}
+%config(noreplace) /etc/cyrus.conf
+%config(noreplace) /etc/imapd.conf
+%config(noreplace) /etc/logrotate.d/%{name}
+%config(noreplace) /etc/sysconfig/%{name}
+%config(noreplace) /etc/pam.d/pop
+%config(noreplace) /etc/pam.d/imap
+%config(noreplace) /etc/pam.d/sieve
+%config(noreplace) /etc/pam.d/lmtp
+%config(noreplace) /etc/pam.d/mupdate
+%config(noreplace) /etc/pam.d/csync
+%config(noreplace) /etc/pam.d/nntp
+/etc/cron.daily/%{name}
 %{_unitdir}/cyrus-imapd.service
-%dir %{_cyrexecdir}
-%{_cyrexecdir}/cyr_systemd_helper
-%{_cyrexecdir}/arbitron
-%{_cyrexecdir}/arbitronsort.pl
-%{_cyrexecdir}/chk_cyrus
-%{_cyrexecdir}/convert-sieve.pl
-%{_cyrexecdir}/cyr_df
-%{_cyrexecdir}/ctl_cyrusdb
-%{_cyrexecdir}/ctl_deliver
-%{_cyrexecdir}/ctl_mboxlist
-%{_cyrexecdir}/cvt_cyrusdb
-%{_cyrexecdir}/cyr_dbtool
-%{_cyrexecdir}/cyr_expire
-%{_cyrexecdir}/cyr_sequence
-%{_cyrexecdir}/cyr_synclog
-%{_cyrexecdir}/cyr_userseen
-%{_cyrexecdir}/cyrdump
-%{_cyrexecdir}/cyrus-master
-%{_cyrexecdir}/deliver
-%{_cyrexecdir}/dohash
-%{_cyrexecdir}/fud
-%{_cyrexecdir}/imapd
-%{_cyrexecdir}/ipurge
-%{_cyrexecdir}/lmtpd
-%{_cyrexecdir}/lmtpproxyd
-%{_cyrexecdir}/masssievec
-%{_cyrexecdir}/mbexamine
-%{_cyrexecdir}/mbpath
-%{_cyrexecdir}/migrate-metadata
-%{_cyrexecdir}/mkimap
-%{_cyrexecdir}/mknewsgroups
-%{_cyrexecdir}/notifyd
-%{_cyrexecdir}/pop3d
-%{_cyrexecdir}/quota
-%{_cyrexecdir}/reconstruct
-%{_cyrexecdir}/rehash
-%{_cyrexecdir}/sievec
-%{_cyrexecdir}/sieved
-%{_cyrexecdir}/smmapd
-%{_cyrexecdir}/squatter
-%{_cyrexecdir}/timsieved
-%{_cyrexecdir}/tls_prune
-%{_cyrexecdir}/translatesieve
-%{_cyrexecdir}/undohash
-%{_cyrexecdir}/unexpunge
-%{_cyrexecdir}/upgradesieve
-%{_cyrexecdir}/cvt_cyrusdb_all
-%{_cyrexecdir}/idled
-%{_cyrexecdir}/mupdate
-%{_cyrexecdir}/mupdate-loadgen.pl
-%{_cyrexecdir}/proxyd
-%{_cyrexecdir}/sync_client
-%{_cyrexecdir}/sync_reset
-%{_cyrexecdir}/sync_server
-%{_cyrexecdir}/cyrfetchnews
-%{_cyrexecdir}/nntpd
-%{_cyrexecdir}/ptdump
-%{_cyrexecdir}/ptexpire
-%{_cyrexecdir}/ptloader
-%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/backup
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/db
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/log
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/meta
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/md5
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/msg
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %{_var}/lib/imap/proc
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %{_var}/lib/imap/ptclient
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/quota
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/rpm
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/sieve
-%attr(0750,%{_cyrususer},%{_cyrusgroup}) %{_var}/lib/imap/socket
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/sync
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/user
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/spool/imap
+%dir %{cyrexecdir}
+%{cyrexecdir}/cyr_systemd_helper
+%{cyrexecdir}/arbitron
+%{cyrexecdir}/arbitronsort.pl
+%{cyrexecdir}/chk_cyrus
+%{cyrexecdir}/convert-sieve.pl
+%{cyrexecdir}/cyr_df
+%{cyrexecdir}/ctl_cyrusdb
+%{cyrexecdir}/ctl_deliver
+%{cyrexecdir}/ctl_mboxlist
+%{cyrexecdir}/cvt_cyrusdb
+%{cyrexecdir}/cyr_dbtool
+%{cyrexecdir}/cyr_expire
+%{cyrexecdir}/cyr_sequence
+%{cyrexecdir}/cyr_synclog
+%{cyrexecdir}/cyr_userseen
+%{cyrexecdir}/cyrdump
+%{cyrexecdir}/cyrus-master
+%{cyrexecdir}/deliver
+%{cyrexecdir}/dohash
+%{cyrexecdir}/fud
+%{cyrexecdir}/imapd
+%{cyrexecdir}/ipurge
+%{cyrexecdir}/lmtpd
+%{cyrexecdir}/lmtpproxyd
+%{cyrexecdir}/masssievec
+%{cyrexecdir}/mbexamine
+%{cyrexecdir}/mbpath
+%{cyrexecdir}/migrate-metadata
+%{cyrexecdir}/mkimap
+%{cyrexecdir}/mknewsgroups
+%{cyrexecdir}/notifyd
+%{cyrexecdir}/pop3d
+%{cyrexecdir}/quota
+%{cyrexecdir}/reconstruct
+%{cyrexecdir}/rehash
+%{cyrexecdir}/sievec
+%{cyrexecdir}/sieved
+%{cyrexecdir}/smmapd
+%{cyrexecdir}/squatter
+%{cyrexecdir}/timsieved
+%{cyrexecdir}/tls_prune
+%{cyrexecdir}/translatesieve
+%{cyrexecdir}/undohash
+%{cyrexecdir}/unexpunge
+%{cyrexecdir}/upgradesieve
+%{cyrexecdir}/cvt_cyrusdb_all
+%{cyrexecdir}/idled
+%{cyrexecdir}/mupdate
+%{cyrexecdir}/mupdate-loadgen.pl
+%{cyrexecdir}/proxyd
+%{cyrexecdir}/sync_client
+%{cyrexecdir}/sync_reset
+%{cyrexecdir}/sync_server
+%{cyrexecdir}/cyrfetchnews
+%{cyrexecdir}/nntpd
+%{cyrexecdir}/ptdump
+%{cyrexecdir}/ptexpire
+%{cyrexecdir}/ptloader
+%attr(0750,%{cyrususer},%{cyrusgroup}) %dir %{_var}/lib/imap
+%attr(0700,%{cyrususer},%{cyrusgroup}) %dir %{_var}/lib/imap/backup
+%attr(0700,%{cyrususer},%{cyrusgroup}) %dir %{_var}/lib/imap/db
+%attr(0700,%{cyrususer},%{cyrusgroup}) %dir %{_var}/lib/imap/log
+%attr(0700,%{cyrususer},%{cyrusgroup}) %dir %{_var}/lib/imap/meta
+%attr(0700,%{cyrususer},%{cyrusgroup}) %dir %{_var}/lib/imap/md5
+%attr(0700,%{cyrususer},%{cyrusgroup}) %dir %{_var}/lib/imap/msg
+%attr(0700,%{cyrususer},%{cyrusgroup}) %{_var}/lib/imap/proc
+%attr(0700,%{cyrususer},%{cyrusgroup}) %{_var}/lib/imap/ptclient
+%attr(0700,%{cyrususer},%{cyrusgroup}) %dir %{_var}/lib/imap/quota
+%attr(0700,%{cyrususer},%{cyrusgroup}) %dir %{_var}/lib/imap/rpm
+%attr(0700,%{cyrususer},%{cyrusgroup}) %dir %{_var}/lib/imap/sieve
+%attr(0750,%{cyrususer},%{cyrusgroup}) %{_var}/lib/imap/socket
+%attr(0700,%{cyrususer},%{cyrusgroup}) %dir %{_var}/lib/imap/sync
+%attr(0700,%{cyrususer},%{cyrusgroup}) %dir %{_var}/lib/imap/user
+%attr(0700,%{cyrususer},%{cyrusgroup}) %dir %{_var}/spool/imap
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/rpm
 %{_datadir}/%{name}/rpm/*
 %{_mandir}/man5/*
 %{_mandir}/man8/*
-%dir %{_sysconfdir}/pki/%{name}
-%attr(0640,root,%{_cyrusgroup}) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{ssl_pem_file}
+%dir /etc/pki/%{name}
+%attr(0640,root,%{cyrusgroup}) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{ssl_pem_file}
 
 %files devel
 %{_includedir}/cyrus