diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 2386db4..1c27866 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -476,18 +476,8 @@ touch %{buildroot}%{ssl_pem_file}
 %{__perl} -pi -e 's/Fetchnews/Cyrfetchnews/g'        doc/man/cyrfetchnews.8.html
 %{__perl} -pi -e 's/FETCHNEWS/CYRFETCHNEWS/g'        doc/man/cyrfetchnews.8.html
 
-# Create filelist for perl package, compress manpages before
+# compress manpages
 [ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
-find %{buildroot}%{perl_vendorarch}/Cyrus %{buildroot}%{perl_vendorarch}/auto/Cyrus -type f -print |
-  %{__sed} "s@^%{buildroot}@@g" |
-  %{__grep} -v perllocal.pod |
-  %{__grep} -v "\.packlist" > cyrus-imapd-perl-%{version}-filelist
-find %{buildroot}%{_perl_man3dir} -type f -name "Cyrus*" -print |
-  %{__sed} "s@^%{buildroot}@@g" >> cyrus-imapd-perl-%{version}-filelist
-if [ "$(%{__cat} cyrus-imapd-perl-%{version}-filelist)X" = "X" ] ; then
-  echo "ERROR: EMPTY FILE LIST"
-  exit -1
-fi
 
 # Remove installed but not packaged files
 %{__rm} -f %{buildroot}%{_cyrexecdir}/not-mkdep
@@ -774,11 +764,32 @@ fi
 %{_libdir}/lib*.a
 %{_mandir}/man3/imclient.3*
 
-%files perl -f cyrus-imapd-perl-%{version}-filelist
+%files perl
 %defattr(-,root,root)
 %doc perl/imap/README
 %doc perl/imap/Changes
 %doc perl/imap/examples
+%dir %{perl_vendorarch}/Cyrus
+%dir %{perl_vendorarch}/Cyrus/IMAP
+%{perl_vendorarch}/Cyrus/IMAP/Admin.pm
+%{perl_vendorarch}/Cyrus/IMAP/Shell.pm
+%{perl_vendorarch}/Cyrus/IMAP/IMSP.pm
+%{perl_vendorarch}/Cyrus/IMAP.pm
+%dir %{perl_vendorarch}/Cyrus/SIEVE
+%{perl_vendorarch}/Cyrus/SIEVE/managesieve.pm
+%dir %{perl_vendorarch}/auto
+%dir %{perl_vendorarch}/auto/Cyrus
+%dir %{perl_vendorarch}/auto/Cyrus/IMAP
+%{perl_vendorarch}/auto/Cyrus/IMAP/IMAP.so
+%{perl_vendorarch}/auto/Cyrus/IMAP/IMAP.bs
+%dir %{perl_vendorarch}/auto/Cyrus/SIEVE/managesieve
+%{perl_vendorarch}/auto/Cyrus/SIEVE/managesieve/managesieve.so
+%{perl_vendorarch}/auto/Cyrus/SIEVE/managesieve/managesieve.bs
+%{_mandir}/man3/Cyrus::IMAP::Admin.3pm.gz
+%{_mandir}/man3/Cyrus::IMAP::Shell.3pm.gz
+%{_mandir}/man3/Cyrus::IMAP.3pm.gz
+%{_mandir}/man3/Cyrus::IMAP::IMSP.3pm.gz
+%{_mandir}/man3/Cyrus::SIEVE::managesieve.3pm.gz
 
 %files utils
 %defattr(0644,root,root,0755)
@@ -786,8 +797,8 @@ fi
 %{_mandir}/man1/*
 
 %changelog
-* Wed Jan 21 2009 Michal Hlavinka <mhlavink@redhat.com> - 2.3.13-2
-- fix: #480138 - assertion failed: libcyr_cfg.c: cyrus_options[opt].opt == opt
+* Mon Feb 02 2009 Michal Hlavinka <mhlavink@rehdat.com> - 2.3.13-2
+- fix directory ownership
 
 * Tue Jan 13 2009 Michal Hlavinka <mhlavink@redhat.com> - 2.3.13-1
 - updated to 2.3.13