diff --git a/.gitignore b/.gitignore
index a344fbe..d606e71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ POE-Component-IRC-6.14.tar.gz
 /POE-Component-IRC-6.77.tar.gz
 /POE-Component-IRC-6.78.tar.gz
 /POE-Component-IRC-6.80.tar.gz
+/POE-Component-IRC-6.81.tar.gz
diff --git a/perl-POE-Component-IRC.spec b/perl-POE-Component-IRC.spec
index 03a8eb6..7da7f92 100644
--- a/perl-POE-Component-IRC.spec
+++ b/perl-POE-Component-IRC.spec
@@ -11,38 +11,47 @@
 
 Name:           perl-POE-Component-IRC
 Summary:        A POE component for building IRC clients
-Version:        6.80
+Version:        6.81
 Release:        1%{?dist}
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 Source0:        http://search.cpan.org/CPAN/authors/id/B/BI/BINGOS/POE-Component-IRC-%{version}.tar.gz 
 URL:            http://search.cpan.org/dist/POE-Component-IRC
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 BuildArch:      noarch
 BuildRequires:  perl(base)
+BuildRequires:  perl(Carp)
 BuildRequires:  perl(constant)
+BuildRequires:  perl(Data::Dumper)
+BuildRequires:  perl(Digest::MD5)
 BuildRequires:  perl(Encode::Guess)
 BuildRequires:  perl(Exporter)
 BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.31
 BuildRequires:  perl(File::Spec::Functions)
 BuildRequires:  perl(IO::Handle)
 BuildRequires:	perl(IRC::Utils) >= 0.11
+BuildRequires:  perl(lib)
 BuildRequires:  perl(List::MoreUtils)
+BuildRequires:  perl(List::Util)
 BuildRequires:  perl(Object::Pluggable)
 BuildRequires:  perl(POE) >= 1.287
-BuildRequires:  perl(POE::Component::Syndicator)
 BuildRequires:  perl(POE::Component::Client::DNS)
+BuildRequires:  perl(POE::Component::Syndicator)
 BuildRequires:  perl(POE::Driver::SysRW)
 BuildRequires:  perl(POE::Filter)
 BuildRequires:  perl(POE::Filter::IRCD) >= 2.42
 BuildRequires:  perl(POE::Filter::Line)
 BuildRequires:  perl(POE::Filter::Stackable)
 BuildRequires:  perl(POE::Filter::Stream)
+BuildRequires:  perl(POE::Filter::Zlib::Stream)
 BuildRequires:  perl(POE::Session)
 BuildRequires:  perl(POE::Wheel::FollowTail)
 BuildRequires:  perl(POE::Wheel::ReadWrite)
 BuildRequires:  perl(POE::Wheel::SocketFactory)
 BuildRequires:  perl(Scalar::Util)
+BuildRequires:  perl(Socket)
+BuildRequires:  perl(Socket6)
+BuildRequires:  perl(Test::Differences)
 BuildRequires:  perl(Test::More) >= 0.47
 Requires:       perl(Object::Pluggable)
 Requires:       perl(POE) >= 1.311
@@ -53,10 +62,10 @@ Requires:       perl(POE::Filter::Stream)
 Requires:       perl(POE::Session)
 Requires:       perl(POE::Wheel::ReadWrite)
 Requires:       perl(POE::Wheel::SocketFactory)
-
+# Added during f19 development cycle
+Obsoletes:      %{name}-tests
 
 %{?perl_default_filter}
-%{?perl_default_subpackage_tests}
 
 %description
 POE::Component::IRC is a POE component (who'd have guessed?) which acts as an
@@ -73,13 +82,12 @@ is to it. Cool, no?
 chmod -c -x Changes README examples/*
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
 make pure_install DESTDIR=%{buildroot}
 find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
-find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
 %{_fixperms} %{buildroot}/*
 # remove errant execute bit from the .pm's
 find %{buildroot} -type f -name '*.pm' -exec chmod -x {} 2>/dev/null ';'
@@ -89,11 +97,16 @@ find %{buildroot} -type f -name '*.pm' -exec chmod -x {} 2>/dev/null ';'
 %{?_with_network_tests: make test}
 
 %files
-%doc Changes README* docs/ examples/ t/
+%doc Changes README* docs/ examples/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Nov 26 2012 Petr Šabata <contyk@redhat.com> - 6.81-1
+- 6.81 bump
+- Drop command macros
+- Drop the tests subpackage
+
 * Thu Sep 20 2012 Petr Pisar <ppisar@redhat.com> - 6.80-1
 - 6.80 bump
 
diff --git a/sources b/sources
index bd2f1a5..ccf4986 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d0f6cc6b22ca010d883da99f09c78ca5  POE-Component-IRC-6.80.tar.gz
+7e01cdd3feb46b96b7623355fcefb547  POE-Component-IRC-6.81.tar.gz