diff --git a/macros.perl b/macros.perl
index e2cab04..b79d73b 100644
--- a/macros.perl
+++ b/macros.perl
@@ -26,13 +26,14 @@
 #
 %perl_make_install make DESTDIR=$RPM_BUILD_ROOT install_vendor
 %perl_process_packlist(n:) \
-  mkdir -p $RPM_BUILD_ROOT/var/adm/perl-modules \
-  test -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod && \
-   { sed -e "s@$RPM_BUILD_ROOT@@g" < $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod > $RPM_BUILD_ROOT/var/adm/perl-modules/%{-n:%{-n*}}%{!-n:%{name}} ; } ; \
-  test -n "$RPM_BUILD_ROOT" -a -d $RPM_BUILD_ROOT/%perl_sitearch/auto && \
-  find $RPM_BUILD_ROOT/%perl_sitearch/auto -name .packlist -print0 | xargs -0 -r perl -spi -e "s@$RPM_BUILD_ROOT@@g" ; \
-  test -n "$RPM_BUILD_ROOT" -a -d $RPM_BUILD_ROOT/%perl_vendorarch/auto && \
-  find $RPM_BUILD_ROOT/%perl_vendorarch/auto -name .packlist -print0 | xargs -0 -r perl -spi -e "s@$RPM_BUILD_ROOT@@g" ; \
+  if [ %{_target_cpu} == noarch ]; then \
+    test -n "$RPM_BUILD_ROOT" -a -d $RPM_BUILD_ROOT%perl_vendorarch/auto && \
+      find $RPM_BUILD_ROOT%perl_vendorarch/auto -name .packlist -print0 | xargs -0 -r rm ; \
+      find $RPM_BUILD_ROOT%perl_vendorarch/auto -depth -type d -print0 | xargs -0 -r rmdir ; \
+  else \
+    test -n "$RPM_BUILD_ROOT" -a -d $RPM_BUILD_ROOT%perl_vendorarch/auto && \
+      find $RPM_BUILD_ROOT%perl_vendorarch/auto -name .packlist -print0 | xargs -0 -r rm ; \
+  fi \
   rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod \
   %nil
 
diff --git a/perl.changes b/perl.changes
index 031e41f..cdd5081 100644
--- a/perl.changes
+++ b/perl.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Nov 22 19:27:42 UTC 2010 - chris@computersalat.de
+
+- rework process_packlist macro
+  o remove .packlist, perllocal.pod file
+    hence no /var/adm/perl-modules/perl-{cpan_name}
+
 -------------------------------------------------------------------
 Wed Nov 17 16:40:13 CET 2010 - meissner@suse.de