diff --git a/namespace-clean-0.20.tar.gz b/namespace-clean-0.20.tar.gz
deleted file mode 100644
index 428c2ff..0000000
--- a/namespace-clean-0.20.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:35fc7e4d23e4132717991090aedb4278b3e1a0f2be243e38c996048815435ad5
-size 17257
diff --git a/namespace-clean-0.21.tar.gz b/namespace-clean-0.21.tar.gz
new file mode 100644
index 0000000..337b88e
--- /dev/null
+++ b/namespace-clean-0.21.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b16069bc9261f8c9f2bd541f96076e0961fa4424ce299dac0c9c5523a18e5836
+size 11809
diff --git a/perl-namespace-clean.changes b/perl-namespace-clean.changes
index 4291e84..6bf5676 100644
--- a/perl-namespace-clean.changes
+++ b/perl-namespace-clean.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Thu Nov 17 12:33:28 UTC 2011 - coolo@suse.com
+
+- update to 0.21
+    - When using the tie() fallback ensure we do not obliterate a
+      foreign tie()
+    - Better document how to disable the tie() fallback
+    - Only invoke the deleted sub stashing if we run udner a debugger
+      (avoid runtime penalty of Sub::Name/Sub::Identify)
+    - Spellfixes (RT#54388)
+    - When B::Hooks::EndOfScope is not available, switch to a simple
+      tie() of %^H. While it can not 100% replace B::H::EOS, it does
+      everything n::c needs
+
 -------------------------------------------------------------------
 Sat Jun  4 20:50:41 UTC 2011 - lars@linux-schulserver.de
 
diff --git a/perl-namespace-clean.spec b/perl-namespace-clean.spec
index 2533c05..b994693 100644
--- a/perl-namespace-clean.spec
+++ b/perl-namespace-clean.spec
@@ -18,15 +18,14 @@
 
 
 Name:           perl-namespace-clean
-Version:        0.20
+Version:        0.21
 Release:        1
 License:        GPL+ or Artistic
 %define cpan_name namespace-clean
 Summary:        Keep imports and functions out of your namespace
 Url:            http://search.cpan.org/dist/namespace-clean/
 Group:          Development/Libraries/Perl
-#Source:         http://www.cpan.org/authors/id/F/FL/FLORA/namespace-clean-%{version}.tar.gz
-Source:         %{cpan_name}-%{version}.tar.gz
+Source:         http://www.cpan.org/authors/id/R/RI/RIBASUSHI/namespace-clean-%{version}.tar.gz
 Patch1:         perl-namespace-clean-use_lib.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -84,6 +83,6 @@ sed -i "s|__vendorperl__|%{perl_vendorlib}|g" Makefile.PL t/*.t
 
 %files -f %{name}.files
 %defattr(644,root,root,755)
-%doc Changes LICENSE README
+%doc Changes
 
 %changelog
diff --git a/perl-namespace-clean_Build_n_Test.patch b/perl-namespace-clean_Build_n_Test.patch
deleted file mode 100644
index 23a432f..0000000
--- a/perl-namespace-clean_Build_n_Test.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-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;