diff --git a/namespace-clean-0.13.tar.gz b/namespace-clean-0.13.tar.gz
deleted file mode 100644
index 09c33d0..0000000
--- a/namespace-clean-0.13.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e4d889223c3624a4490fdb4f915ad41b4edb98c4d3dfbedd32e279d240d4908f
-size 29579
diff --git a/namespace-clean-0.18.tar.bz2 b/namespace-clean-0.18.tar.bz2
new file mode 100644
index 0000000..a461a5d
--- /dev/null
+++ b/namespace-clean-0.18.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b8cb5d60e8f3a0a319bbe77e9308812d8eecd7ebfbaa6acd39c10ff616861c1f
+size 15750
diff --git a/perl-namespace-clean.changes b/perl-namespace-clean.changes
new file mode 100644
index 0000000..a82b264
--- /dev/null
+++ b/perl-namespace-clean.changes
@@ -0,0 +1,32 @@
+-------------------------------------------------------------------
+Mon Jul 12 13:24:40 UTC 2010 - chris@computersalat.de
+
+- update to 0.18
+  - Make sure we continue working on future Package::Stash
+    versions (doy).
+- [0.17]
+  - Make sure the debugger author test is skipped for
+    non-authors before the debugger is even loaded.
+- [0.16]
+  - Release all changes of 0.15 as part of a stable release.
+  - Convert from Module::Install to Dist::Zilla.
+- [0.15] TRIAL release
+  - Use Package::Stash for the stash manipulation bits (doy).
+- [0.14] Thu Mar 18 11:15:38 CET 2010
+  - Disable auto_install.
+  - Turn the error prone debugger test into an author test.
+- recreated by cpanspec 1.78
+- noarch pkg
+- added Build_n_Test patch
+  o otherwise Test::More >= 0.88 would be needed
+
+-------------------------------------------------------------------
+Tue Feb  9 13:11:34 CET 2010 - nine@detonation.org
+
+- Upgraded to version 0.13
+
+-------------------------------------------------------------------
+Tue Jan 12 13:26:57 CET 2010 - nine@detonation.org
+
+- Specfile autogenerated by cpanspec 1.78.
+
diff --git a/perl-namespace-clean.spec b/perl-namespace-clean.spec
index e15d0e9..c6d072e 100644
--- a/perl-namespace-clean.spec
+++ b/perl-namespace-clean.spec
@@ -1,59 +1,87 @@
+#
+# spec file for package perl-namespace-clean (Version 0.18)
+#
+# 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.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+# norootforbuild
+
 Name:           perl-namespace-clean
-Version:        0.13
-Release:        1%{?dist}
+%define cpan_name namespace-clean
 Summary:        Keep imports and functions out of your namespace
+Version:        0.18
+Release:        1
 License:        GPL+ or Artistic
 Group:          Development/Libraries/Perl
-URL:            http://search.cpan.org/dist/namespace-clean/
-Source0:        http://www.cpan.org/modules/by-module/namespace/namespace-clean-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Url:            http://search.cpan.org/dist/namespace-clean/
+#Source:         http://www.cpan.org/modules/by-module/namespace/namespace-clean-%{version}.tar.gz
+Source:         %{cpan_name}-%{version}.tar.bz2
+# would require Test::More >= 0.88 (done_testing)
+%if 0%{?suse_version} < 1120
+Patch0:         %{name}_Build_n_Test.patch
+%endif
 BuildArch:      noarch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  perl
+%if 0%{?suse_version} < 1120
+BuildRequires:  perl-macros
+%endif
 BuildRequires:  perl(B::Hooks::EndOfScope) >= 0.07
+BuildRequires:  perl(constant)
+BuildRequires:  perl(Exporter)
+BuildRequires:  perl(Package::Stash) >= 0.03
 BuildRequires:  perl(Sub::Identify) >= 0.04
 BuildRequires:  perl(Sub::Name) >= 0.04
-BuildRequires:  perl(Symbol)
+BuildRequires:  perl(vars)
 Requires:       perl = %{perl_version}
 Requires:       perl(B::Hooks::EndOfScope) >= 0.07
+Requires:       perl(Package::Stash) >= 0.03
 Requires:       perl(Sub::Identify) >= 0.04
 Requires:       perl(Sub::Name) >= 0.04
-Requires:       perl(Symbol)
+Requires:       perl(vars)
 
 %description
 Keeping packages clean
 
 %prep
-%setup -q -n namespace-clean-%{version}
+%setup -q -n %{cpan_name}-%{version}
+# would require Test::More >= 0.88 (done_testing)
+%if 0%{?suse_version} < 1120
+%patch0 -p1
+%endif
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags}
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
-
-%{_fixperms} $RPM_BUILD_ROOT/*
+%{__make} %{?_smp_mflags}
 
 %check
-make test
+%{__make} test
+
+%install
+%perl_make_install
+# do not perl_process_packlist (noarch)
+# remove .packlist file
+%{__rm} -rf $RPM_BUILD_ROOT%perl_vendorarch
+# remove perllocal.pod file
+%{__rm} -rf $RPM_BUILD_ROOT%perl_archlib
+%perl_gen_filelist
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.files
 %defattr(-,root,root,-)
-%doc Changes README
-%{perl_vendorlib}/*
-%{_mandir}/man3/*
+%doc Changes dist.ini LICENSE META.json README
 
 %changelog
-* Tue Feb 09 2010 Stefan Seifert <nine@detonation.org> 0.13-1
-- Upgraded to version 0.13
-
-* Tue Jan 12 2010 Stefan Seifert <nine@detonation.org> 0.11-1
-- Specfile autogenerated by cpanspec 1.78.
diff --git a/perl-namespace-clean_Build_n_Test.patch b/perl-namespace-clean_Build_n_Test.patch
new file mode 100644
index 0000000..23a432f
--- /dev/null
+++ b/perl-namespace-clean_Build_n_Test.patch
@@ -0,0 +1,72 @@
+diff -ruN namespace-clean-0.18-orig/Makefile.PL namespace-clean-0.18/Makefile.PL
+--- namespace-clean-0.18-orig/Makefile.PL	2010-06-13 19:11:17.000000000 +0200
++++ namespace-clean-0.18/Makefile.PL	2010-07-12 15:16:14.000000000 +0200
+@@ -14,7 +14,7 @@
+   'BUILD_REQUIRES' => {
+     'Exporter' => '0',
+     'FindBin' => '0',
+-    'Test::More' => '0.88',
++    'Test::More' => '0',
+     'constant' => '0'
+   },
+   'CONFIGURE_REQUIRES' => {
+diff -ruN namespace-clean-0.18-orig/META.json namespace-clean-0.18/META.json
+--- namespace-clean-0.18-orig/META.json	2010-06-13 19:11:17.000000000 +0200
++++ namespace-clean-0.18/META.json	2010-07-12 15:16:30.000000000 +0200
+@@ -34,7 +34,7 @@
+          "requires" : {
+             "Exporter" : 0,
+             "FindBin" : 0,
+-            "Test::More" : "0.88",
++            "Test::More" : "0",
+             "constant" : 0
+          }
+       }
+diff -ruN namespace-clean-0.18-orig/META.yml namespace-clean-0.18/META.yml
+--- namespace-clean-0.18-orig/META.yml	2010-06-13 19:11:17.000000000 +0200
++++ namespace-clean-0.18/META.yml	2010-07-12 15:16:41.000000000 +0200
+@@ -7,7 +7,7 @@
+ build_requires:
+   Exporter: 0
+   FindBin: 0
+-  Test::More: 0.88
++  Test::More: 0
+   constant: 0
+ configure_requires:
+   ExtUtils::MakeMaker: 6.31
+diff -ruN namespace-clean-0.18-orig/t/08-const-sub.t namespace-clean-0.18/t/08-const-sub.t
+--- namespace-clean-0.18-orig/t/08-const-sub.t	2010-06-13 19:11:17.000000000 +0200
++++ namespace-clean-0.18/t/08-const-sub.t	2010-07-12 15:17:35.000000000 +0200
+@@ -1,7 +1,7 @@
+ use strict;
+ use warnings;
+ 
+-use Test::More 0.88;
++use Test::More qw(no_plan);
+ 
+ use constant CONST => 123;
+ use namespace::clean;
+@@ -11,4 +11,4 @@
+ 
+ ok eval("!defined(&CONST)");
+ 
+-done_testing;
++#done_testing;
+diff -ruN namespace-clean-0.18-orig/t/author-07-debugger.t namespace-clean-0.18/t/author-07-debugger.t
+--- namespace-clean-0.18-orig/t/author-07-debugger.t	2010-06-13 19:11:17.000000000 +0200
++++ namespace-clean-0.18/t/author-07-debugger.t	2010-07-12 15:18:10.000000000 +0200
+@@ -6,7 +6,7 @@
+   }
+ }
+ 
+-use Test::More;
++use Test::More qw(no_plan);
+ 
+ BEGIN {
+     plan skip_all => 'Only applicable on perl >= 5.8.9'
+@@ -44,4 +44,4 @@
+ 
+ Foo->bar();
+ 
+-done_testing;
++#done_testing;