diff --git a/.gitignore b/.gitignore
index f7020d4..8170de2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 Text-ASCIITable-0.18.tar.gz
+/Text-ASCIITable-0.20.tar.gz
diff --git a/perl-Text-ASCIITable.spec b/perl-Text-ASCIITable.spec
index 37a5a64..1f9d871 100644
--- a/perl-Text-ASCIITable.spec
+++ b/perl-Text-ASCIITable.spec
@@ -1,14 +1,17 @@
 Name:           perl-Text-ASCIITable
-Version:        0.18
-Release:        11%{?dist}
+Version:        0.20
+Release:        1%{?dist}
 Summary:        Create a nice formatted table using ASCII characters
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Text-ASCIITable/
 Source0:        http://www.cpan.org/authors/id/L/LU/LUNATIC/Text-ASCIITable-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  perl(Module::Build)
+BuildRequires:  perl(Carp)
+BuildRequires:  perl(Encode)
+BuildRequires:  perl(Exporter)
+BuildRequires:  perl(List::Util)
+BuildRequires:  perl(Module::Build) >= 0.2611
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -18,38 +21,34 @@ human-readable, or "cool" way.
 
 %prep
 %setup -q -n Text-ASCIITable-%{version}
+iconv -f latin1 -t utf8 README > README.conv && mv -f README.conv README
 
 %build
-%{__perl} Build.PL installdirs=vendor
+perl Build.PL installdirs=vendor
 ./Build
 
 %install
-rm -rf %{buildroot}
-
 ./Build install destdir=%{buildroot} create_packlist=0
 find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
-
-# fix UTF-8'ness
 cd %{buildroot}%{_mandir}/man3/
 for i in Text::ASCIITable::Wrap.3pm Text::ASCIITable.3pm ; do
-    /usr/bin/iconv -f iso8859-1 -t utf-8 $i > $i.conv && /bin/mv -f $i.conv $i
+    iconv -f iso8859-1 -t utf-8 $i > $i.conv && mv -f $i.conv $i
 done
-
 %{_fixperms} %{buildroot}/*
 
 %check
 ./Build test
 
-%clean
-rm -rf %{buildroot}
-
 %files
-%defattr(-,root,root,-)
 %doc Changes README ansi-example.pl
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Fri Jan 13 2012 Petr Šabata <contyk@redhat.com> - 0.20-1
+- 0.20 bump
+- Spec cleanup
+
 * Fri Jun 17 2011 Marcela Mašláňová <mmaslano@redhat.com> - 0.18-11
 - Perl mass rebuild
 
diff --git a/sources b/sources
index 8fe0205..a2be7d6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-25fea1cef17be49a6da1d9b5267fba97  Text-ASCIITable-0.18.tar.gz
+13dce0bcfa2484501199222bab251f87  Text-ASCIITable-0.20.tar.gz