diff --git a/.gitignore b/.gitignore
index 5871db8..2740392 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 Date-Pcalc-1.2.tar.gz
+/Date-Pcalc-6.1.tar.gz
diff --git a/perl-Date-Pcalc.spec b/perl-Date-Pcalc.spec
index eb2fc0a..597485d 100644
--- a/perl-Date-Pcalc.spec
+++ b/perl-Date-Pcalc.spec
@@ -1,17 +1,17 @@
 Name: 		perl-Date-Pcalc
-Version:	1.2
-Release:	11%{?dist}
+Version:	6.1
+Release:	1%{?dist}
 Summary:	Gregorian calendar date calculations
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 URL: 		http://search.cpan.org/dist/Date-Pcalc/
 Source0: 	http://search.cpan.org/CPAN/authors/id/S/ST/STBEY/Date-Pcalc-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildArch: 	noarch
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires:  %{_bindir}/iconv
 BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(Bit::Vector) >= 7.1
+BuildRequires:  perl(Carp::Clan) >= 5.3
 
 %description
 This package consists of a Perl module for all kinds of date calculations based
@@ -27,28 +27,31 @@ DIN 1355 and, to some extent, ISO 8601 (where applicable).
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %{_bindir}/iconv --from-code=ISO-8859-1 --to-code=UTF-8 blib/man3/Date::Pcalc.3pm -o blib/man3/Date::Pcalc.3pm-utf8
-mv  blib/man3/Date::Pcalc.3pm-utf8 blib/man3/Date::Pcalc.3pm 
+mv blib/man3/Date::Pcalc.3pm-utf8 blib/man3/Date::Pcalc.3pm 
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %check
 make test
 
+# Interactive build, prompts if binary of PP version should be built
+# Defaults to binary if gcc is found (default Fedora buildroot contains gcc)
+# There's No option available to specify explicitly
 %files
 %defattr(-,root,root,-)
 %doc CHANGES.txt README.txt EXAMPLES.txt CREDITS.txt GNU_GPL.txt Artistic.txt
-%{perl_vendorlib}/Date
+%{perl_vendorarch}/auto/Date
+%{perl_vendorarch}/Date
 %{_mandir}/man3/*
 
 %changelog
+* Tue Apr 05 2011 Petr Sabata <psabata@redhat.com> - 6.1-1
+- 6.1 bump
+- Removing obsolete Buildroot stuff
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 33c172e..e80507c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1c09a09337c7d2e18a17898ca577c644  Date-Pcalc-1.2.tar.gz
+6a719d8fe10ac673be5d09e003130aa8  Date-Pcalc-6.1.tar.gz