diff --git a/.gitignore b/.gitignore
index 559f2de..3adec4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /B-Hooks-OP-Check-EntersubForCV-0.09.tar.gz
+/B-Hooks-OP-Check-EntersubForCV-0.10.tar.gz
diff --git a/.rpmlint b/.rpmlint
new file mode 100644
index 0000000..f7e611c
--- /dev/null
+++ b/.rpmlint
@@ -0,0 +1,2 @@
+from Config import *
+addFilter("spelling-error .* entersub");
diff --git a/B-Hooks-OP-Check-EntersubForCV-0.09-Perl-5.21.4-compatibility.patch b/B-Hooks-OP-Check-EntersubForCV-0.09-Perl-5.21.4-compatibility.patch
deleted file mode 100644
index 0880cb1..0000000
--- a/B-Hooks-OP-Check-EntersubForCV-0.09-Perl-5.21.4-compatibility.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 6c62adb1722a96370dbe8d294d36f9382b0788fa Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni@debian.org>
-Date: Sun, 27 Dec 2015 11:47:24 +0200
-Subject: [PATCH] Perl >= 5.21.4 compatibility
-
-This fixes test failures since perl commit v5.21.3-654-ga65cc14 .
-
-Bug: https://rt.cpan.org/Public/Bug/Display.html?id=94945
-Bug-Debian: https://bugs.debian.org/787499
----
- EntersubForCV.xs | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/EntersubForCV.xs b/EntersubForCV.xs
-index 870d470..4acbcab 100644
---- a/EntersubForCV.xs
-+++ b/EntersubForCV.xs
-@@ -60,7 +60,12 @@ entersub_cb (pTHX_ OP *op, void *user_data) {
- 		return op;
- 	}
- 
--	cv = GvCV (cGVOPx_gv (kid));
-+	GV *gv = cGVOPx_gv (kid);
-+	if (SvROK(gv)) { /* since v5.21.3-654-ga65cc14 */
-+		cv = (CV *)SvRV(gv);
-+	} else {
-+		cv = GvCV (gv);
-+	}
- 
- 	if (ud->cv == cv) {
- 		op = ud->cb (aTHX_ op, cv, ud->ud);
--- 
-2.6.4
-
diff --git a/perl-B-Hooks-OP-Check-EntersubForCV.spec b/perl-B-Hooks-OP-Check-EntersubForCV.spec
index 00b0196..5e48cce 100644
--- a/perl-B-Hooks-OP-Check-EntersubForCV.spec
+++ b/perl-B-Hooks-OP-Check-EntersubForCV.spec
@@ -1,21 +1,19 @@
 Name:           perl-B-Hooks-OP-Check-EntersubForCV
-Version:        0.09
-Release:        15%{?dist}
+Version:        0.10
+Release:        1%{?dist}
 Summary:        Invoke callbacks on construction of entersub OPs for certain CVs
 License:        GPL+ or Artistic
-Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/B-Hooks-OP-Check-EntersubForCV/
 Source0:        http://www.cpan.org/authors/id/Z/ZE/ZEFRAM/B-Hooks-OP-Check-EntersubForCV-%{version}.tar.gz
-# Restore compatibility with Perl 5.22, bug #1231104, CPAN RT#94945
-Patch0:         B-Hooks-OP-Check-EntersubForCV-0.09-Perl-5.21.4-compatibility.patch
 # Remove unwanted build dependencies
-Patch1:         B-Hooks-OP-Check-EntersubForCV-0.09-Disable-author-tests.patch
+Patch0:         B-Hooks-OP-Check-EntersubForCV-0.09-Disable-author-tests.patch
 BuildRequires:  coreutils
 BuildRequires:  findutils
+BuildRequires:  gcc
 BuildRequires:  make
-BuildRequires:  perl-interpreter
 BuildRequires:  perl-devel
 BuildRequires:  perl-generators
+BuildRequires:  perl-interpreter
 BuildRequires:  perl(ExtUtils::Depends)
 BuildRequires:  perl(inc::Module::Install)
 BuildRequires:  perl(Module::Install::Makefile)
@@ -52,18 +50,16 @@ B::Hooks::OP::Check::EntersubForCV Perl module from XS code.
 %prep
 %setup -q -n B-Hooks-OP-Check-EntersubForCV-%{version}
 %patch0 -p1
-%patch1 -p1
 # Remove bundled modules
 rm -rf inc
 sed -i -e '/^inc\//d' MANIFEST
 
 %build
-perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
+perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 OPTIMIZE="%{optflags}"
 make %{?_smp_mflags}
 
 %install
 make pure_install DESTDIR=%{buildroot}
-find %{buildroot} -type f -name .packlist -delete
 find %{buildroot} -type f -name '*.bs' -size 0 -delete
 %{_fixperms} %{buildroot}/*
 
@@ -81,6 +77,9 @@ make test
 %{perl_vendorarch}/B/Hooks/OP/Check/EntersubForCV/Install
 
 %changelog
+* Tue Aug 01 2017 Petr Pisar <ppisar@redhat.com> - 0.10-1
+- 0.10 bump
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.09-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
diff --git a/sources b/sources
index 7080290..158fd2f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5eb9a1c6038acf0a6da0a28f25c862f1  B-Hooks-OP-Check-EntersubForCV-0.09.tar.gz
+SHA512 (B-Hooks-OP-Check-EntersubForCV-0.10.tar.gz) = abfc9daf449f8251f5ed55ff2592827da25e4b49869a78f7548043914585a5582bf2a9f6d1d6d19a8971d14805d45f18c1717cd88dc8ab2cad79c921fd20b9c9