diff --git a/.gitignore b/.gitignore
index 09c95f4..936775a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 XML-Writer-0.606.tar.gz
 /XML-Writer-0.612.tar.gz
+/XML-Writer-0.621.tar.gz
diff --git a/perl-XML-Writer.spec b/perl-XML-Writer.spec
index 02cb00b..8d01459 100644
--- a/perl-XML-Writer.spec
+++ b/perl-XML-Writer.spec
@@ -1,6 +1,6 @@
 Name:           perl-XML-Writer
-Version:        0.612
-Release:        6%{?dist}
+Version:        0.621
+Release:        1%{?dist}
 Summary:        A simple Perl module for writing XML documents
 
 Group:          Development/Libraries
@@ -9,14 +9,21 @@ URL:            http://search.cpan.org/dist/XML-Writer/
 Source0:        http://www.cpan.org/authors/id/J/JO/JOSEPHW/XML-Writer-%{version}.tar.gz
 
 BuildArch:      noarch
+BuildRequires:  perl
+BuildRequires:  perl(Algorithm::Diff)
 BuildRequires:  perl(Carp)
 BuildRequires:  perl(Encode)
+BuildRequires:  perl(Errno)
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(IO::File)
 BuildRequires:  perl(IO::Handle)
+BuildRequires:  perl(overload)
+BuildRequires:  perl(strict)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Pod) >= 1.00
 BuildRequires:  perl(Test::Pod::Coverage)
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(vars)
+BuildRequires:  perl(warnings)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -30,6 +37,7 @@ there are not duplicate attribute names.
 
 %prep
 %setup -q -n XML-Writer-%{version}
+find examples -type f -exec chmod -x {} +
 
 
 %build
@@ -41,7 +49,6 @@ make %{?_smp_mflags}
 make pure_install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -a \( -name .packlist \
   -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 
 
 %check
@@ -49,12 +56,19 @@ make test
 
 
 %files
-%doc Changes README TODO LICENSE
+%doc Changes README TODO LICENSE examples
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Mon Apr 15 2013 Petr Šabata <contyk@redhat.com> - 0.621-1
+- 0.621 bump
+- Lots of bugfixes
+- Packaging examples
+- Fixing build-time deps and removing unneeded lines
+- Fixing changelog issues
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.612-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
@@ -85,7 +99,7 @@ make test
 * Fri May 07 2010 Marcela Maslanova <mmaslano@redhat.com> - 0.606-6
 - Mass rebuild with perl-5.12.0
 
-* Wed Feb 25 2010 Marcela Mašláňová <mmaslano@redhat.com> - 0.606-6
+* Thu Feb 25 2010 Marcela Mašláňová <mmaslano@redhat.com> - 0.606-6
 - make rpmlint happy
 
 * Mon Dec  7 2009 Stepan Kasal <skasal@redhat.com> - 0.606-4
@@ -117,12 +131,12 @@ make test
 - Update to latest upstream
 
 * Mon Mar 26 2007 Alex Lancaster <alexl@users.sourceforge.net> 0.602-3
-- Fixed %check
+- Fixed %%check
 
-* Wed Mar 23 2007 Alex Lancaster <alexl@users.sourceforge.net> 0.602-2
+* Fri Mar 23 2007 Alex Lancaster <alexl@users.sourceforge.net> 0.602-2
 - Update BR as per suggestions from review by Ralf Corsepius
 
-* Wed Mar 23 2007 Alex Lancaster <alexl@users.sourceforge.net> 0.602-1
+* Fri Mar 23 2007 Alex Lancaster <alexl@users.sourceforge.net> 0.602-1
 - Update to 0.602
 
 * Wed Apr 06 2005 Hunter Matthews <thm@duke.edu> 0.531-1
diff --git a/sources b/sources
index 4e341da..86b398e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2f3c6c282f9f79d33639c55bf7afa4b0  XML-Writer-0.612.tar.gz
+faef055a740be1fb6742f69f608fc158  XML-Writer-0.621.tar.gz