diff --git a/perl-Convert-PEM.changes b/perl-Convert-PEM.changes
new file mode 100644
index 0000000..ab0fda6
--- /dev/null
+++ b/perl-Convert-PEM.changes
@@ -0,0 +1,14 @@
+-------------------------------------------------------------------
+Fri Jun 19 00:37:07 CEST 2009 - chris@computersalat.de
+
+- added perl-macros
+  o autogen filelist with perl_gen_filelist
+
+-------------------------------------------------------------------
+Sun Jun 14 16:08:56 CEST 2009 - chris@computersalat.de
+
+- fixed deps
+- some spec mods
+  o updated header
+  o autogen filelist
+
diff --git a/perl-Convert-PEM.spec b/perl-Convert-PEM.spec
index 511714f..198c2f0 100644
--- a/perl-Convert-PEM.spec
+++ b/perl-Convert-PEM.spec
@@ -1,57 +1,101 @@
-%define modname	Convert-PEM
-Name:           perl-%{modname}
-Version:        0.07
-Release:        2
+#
+# spec file for package perl-Convert-PEM
+# 
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+# norootforbuild
+
+#Distribution:   %dist
+#Packager:       %packager
+#Vendor:         %vendor
+
+Name:           perl-Convert-PEM
+%define cpan_name %( echo %{name} | %{__sed} -e 's,perl-,,' )
 Summary:        Read/write encrypted ASN.1 PEM files
-Requires:       perl = %{perl_version} perl-Convert-ASN1 perl-Crypt-DES_EDE3
-Requires:       perl(Class::ErrorHandler) perl(MIME::Base64)
-BuildRequires:  perl perl-Convert-ASN1 perl-Crypt-DES_EDE3
-BuildRequires:  perl-Class-ErrorHandler
-Requires:       perl(Digest::MD5)
-BuildRequires:  perl(Digest::MD5)
+Version:        0.07
+Release:        1
 License:        GPL/Artistic
 Group:          Development/Libraries/Perl
-Source:         %{modname}-%{version}.tar.bz2
+Url:            http://www.cpan.org
+Source:         %{cpan_name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-root
+BuildRequires:  perl
+BuildRequires:  perl-macros
+# other not perl || perl-base
+BuildRequires:  perl(Class::ErrorHandler)
+BuildRequires:  perl(MIME::Base64)
+BuildRequires:  perl(Convert::ASN1) >= 0.10
+BuildRequires:  perl(Crypt::DES_EDE3)
+BuildRequires:  perl(Digest::MD5)
+Requires:  perl = %{perl_version}
+# other not perl || perl-base
+Requires:  perl(Class::ErrorHandler)
+Requires:  perl(MIME::Base64)
+Requires:  perl(Convert::ASN1) >= 0.10
+Requires:  perl(Crypt::DES_EDE3)
+Requires:  perl(Digest::MD5)
 
+#-------------------------------------------------------------------------------
 %description
-Convert::PEM> reads and writes PEM files containing ASN.1-encoded objects. The
+#-------------------------------------------------------------------------------
+ %{cpan_name} module for perl
+
+Convert::PEM reads and writes PEM files containing ASN.1-encoded objects. The
 files can optionally be encrypted using a symmetric cipher algorithm, such as
 3DES.
 
-Authors:
---------
-    Benjamin Trott <ben@rhumba.pair.com>
+  Authors:	Benjamin Trott <ben@rhumba.pair.com>
 
+--------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
 %prep
-%setup -q -n %{modname}-%{version}
+#-------------------------------------------------------------------------------
+%setup -q -n %{cpan_name}-%{version}
 
+#-------------------------------------------------------------------------------
 %build
-perl Makefile.PL OPTIMIZE="$RPM_OPT_FLAGS -Wall"
-make
-make test
+#-------------------------------------------------------------------------------
+CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL
+%{__make}
 
+%check
+%{__make} test
+
+#-------------------------------------------------------------------------------
 %install
-rm -rf %{buildroot}
-make DESTDIR=$RPM_BUILD_ROOT install_vendor
+#-------------------------------------------------------------------------------
+%perl_make_install
 %perl_process_packlist
+%perl_gen_filelist
 
+#-------------------------------------------------------------------------------
 %clean
-rm -rf %{buildroot}
+#-------------------------------------------------------------------------------
+%{__rm} -rf $RPM_BUILD_ROOT
 
-%files
-%defattr(-, root, root)
-%doc README Changes ToDo
-%doc %{_mandir}/man?/*
-%{perl_vendorlib}/Convert/PEM
-%{perl_vendorlib}/Convert/PEM.pm
-%{perl_vendorarch}/auto/Convert/PEM
-/var/adm/perl-modules/%{name}
+#-------------------------------------------------------------------------------
+%files -f %{name}.files
+#-------------------------------------------------------------------------------
+%defattr(-,root,root)
+%doc Changes README
 
+#-------------------------------------------------------------------------------
 %changelog
-
+#-------------------------------------------------------------------------------
 * Tue Oct 31 2006 - James Oakley <jfunk@funktronics.ca> - 0.07-2
 - Don't require perl-Digest-MD5 in openSUSE >= 10.1. It's in core now
-
 * Tue Sep 12 2006 - James Oakley <jfunk@funktronics.ca> - 0.07-1
 - Initial release