diff --git a/perl-File-LibMagic.changes b/perl-File-LibMagic.changes
index 5f5fa90..892a728 100644
--- a/perl-File-LibMagic.changes
+++ b/perl-File-LibMagic.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jul  2 10:58:13 UTC 2010 - chris@computersalat.de
+
+- spec mods
+  o added header
+  o cleanup
+
 -------------------------------------------------------------------
 Tue Jun 29 13:02:49 UTC 2010 - jw@novell.com
 
diff --git a/perl-File-LibMagic.spec b/perl-File-LibMagic.spec
index 78d8e4d..880ab81 100644
--- a/perl-File-LibMagic.spec
+++ b/perl-File-LibMagic.spec
@@ -1,17 +1,40 @@
+#
+# spec file for package perl-File-LibMagic (Version 0.96)
+#
+# Copyright (c) 2010 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.
 
-Name:       perl-File-LibMagic
-Version:    0.96
-Release:    0%{?dist}
-License:    GPL+ or Artistic
-Group:      Development/Libraries/Perl
-Summary:    Perlwrapper for libmagic (file-4.x or file-5.x)
-Source:     http://search.cpan.org/CPAN/authors/id/F/FI/FITZNER/File-LibMagic-%{version}.tgz
-Url:        http://search.cpan.org/dist/File-LibMagic
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:  perl = %(eval "`%{__perl} -V:version`"; echo $version)
-BuildRequires: zlib-devel file-devel
-Requires:  zlib file
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
 
+# norootforbuild
+
+Name:           perl-File-LibMagic
+%define cpan_name File-LibMagic
+Summary:        Perlwrapper for libmagic (file-4.x or file-5.x)
+Version:        0.96
+Release:        0%{?dist}
+License:        GPL+ or Artistic
+Group:          Development/Libraries/Perl
+Url:            http://search.cpan.org/dist/File-LibMagic
+Source:         http://search.cpan.org/CPAN/authors/id/F/FI/FITZNER/File-LibMagic-%{version}.tgz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  perl
+%if 0%{?suse_version} < 1120
+BuildRequires:  perl-macros
+%endif
+BuildRequires:  zlib-devel file-devel
+#
+Requires:       perl = %{perl_version}
+Requires:       zlib file
 
 
 %description
@@ -22,22 +45,35 @@ MagicBuffer() or MagicFile(), use the functions of libmagic(3) or use
 the OO-Interface.Simple Interface MagicBuffer() fixme
 
 
+Authors:
+--------
+     Andreas Fitzner <fitzner@informatik.hu-berlin.de>
+     Michael Hendricks <michael@ndrix.org>
+
+
 %prep
-%setup -q -n File-LibMagic-%{version}
+%setup -q -n %{cpan_name}-%{version}
 
 %build
-    if [ -f Build.PL ]; then
+if [ -f Build.PL ]; then
     %{__perl} Build.PL --installdirs vendor
 else
    [ -f Makefile.PL ] || exit 2
     %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
 fi
-    if [ -f Build.PL ]; then
+if [ -f Build.PL ]; then
     ./Build build flags=%{?_smp_mflags}
 else
     make %{?_smp_mflags}
 fi
 
+%check
+if [ -f Build.PL ]; then
+   ./Build test
+else
+   make test
+fi
+
 %install
 
 if [ -f Build.PL ]; then
@@ -45,31 +81,21 @@ if [ -f Build.PL ]; then
 else
     make pure_install PERL_INSTALL_ROOT=%{buildroot}
 fi
-    find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
-    find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
-    find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
+find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
 
-    mkdir -p %{buildroot}/%{_mandir}/man3/ %{buildroot}/usr/bin
+mkdir -p %{buildroot}/%{_mandir}/man3/ %{buildroot}/usr/bin
 
-    %{_fixperms} %{buildroot}/*
+%{_fixperms} %{buildroot}/*
 %perl_gen_filelist
 
-%check
-    if [ -f Build.PL ]; then
-   ./Build test
-else
-   make test
-fi
-
 %clean
-    rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 %files -f %{name}.files
 %defattr(-,root,root,-)
 %doc Changes README example
 
 %changelog
-* Sat Jun 26 2010 %{packager} 0.96-0
-- initial SUSE packaging
-- generated with cpan2dist (CPANPLUS::Dist::SUSE version 0.0.8)