diff --git a/.gitignore b/.gitignore
index 62f3bae..137fd0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /Type-Tiny-1.004004.tar.gz
+/Type-Tiny-1.012004.tar.gz
diff --git a/perl-Type-Tiny.spec b/perl-Type-Tiny.spec
index c149468..8edc0da 100644
--- a/perl-Type-Tiny.spec
+++ b/perl-Type-Tiny.spec
@@ -4,12 +4,17 @@
 # Marked as unstable (cf. lib/Reply/Plugin/TypeTiny.pm)
 %bcond_with reply_plugin
 
+# Bootstrap for EPEL
+%if 0%{?rhel}
+%global perl_bootstrap 1
+%endif
+
 Name:           perl-Type-Tiny
-Version:        1.004004
-Release:        2%{?dist}
+Version:        1.012004
+Release:        0%{?dist}
 Summary:        Tiny, yet Moo(se)-compatible type constraint
 License:        GPL+ or Artistic
-URL:            https://metacpan.org/release/Type-Tiny
+URL:            http://typetiny.toby.ink/
 Source0:        https://cpan.metacpan.org/modules/by-module/Test/Type-Tiny-%{version}.tar.gz
 BuildArch:      noarch
 # Module Build
@@ -23,7 +28,7 @@ BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
 BuildRequires:  sed
 # Module Runtime
 BuildRequires:  perl(B)
-BuildRequires:  perl(Exporter::Tiny) >= 0.040
+BuildRequires:  perl(Exporter::Tiny) >= 1.000000
 BuildRequires:  perl(overload)
 BuildRequires:  perl(Scalar::Util)
 BuildRequires:  perl(strict)
@@ -55,10 +60,12 @@ BuildRequires:  perl(Test::Builder)
 BuildRequires:  perl(Test::Fatal)
 BuildRequires:  perl(Test::More) >= 0.96
 BuildRequires:  perl(Test::Requires)
+BuildRequires:  perl(threads)
 # Optional Tests
 BuildRequires:  perl(Benchmark)
 BuildRequires:  perl(Devel::Cover)
 BuildRequires:  perl(Devel::Hide)
+BuildRequires:  perl(Devel::Refcount)
 BuildRequires:  perl(Exporter) >= 5.59
 BuildRequires:  perl(Function::Parameters) >= 1.0103
 BuildRequires:  perl(IO::File)
@@ -90,22 +97,23 @@ BuildRequires:  perl(MouseX::Types::Moose)
 BuildRequires:  perl(Object::Accessor) >= 0.30
 BuildRequires:  perl(Role::Tiny)
 BuildRequires:  perl(Role::Tiny::With)
+BuildRequires:  perl(Specio)
 BuildRequires:  perl(Sub::Exporter::Lexical) >= 0.092291
 BuildRequires:  perl(Sub::Quote)
 BuildRequires:  perl(Test::LeakTrace)
+BuildRequires:  perl(Test::Memory::Cycle)
 BuildRequires:  perl(Test::Moose)
 BuildRequires:  perl(Test::Tester) >= 0.109
 BuildRequires:  perl(Test::Warnings) >= 0.005
-BuildRequires:  perl(threads)
 BuildRequires:  perl(Tie::Array)
 BuildRequires:  perl(Tie::Hash)
 BuildRequires:  perl(Tie::Scalar)
-BuildRequires:  perl(Validation::Class) >= 7.900017
-BuildRequires:  perl(Validation::Class::Simple)
 # Optional test requirements that depend on this package themselves
-%if !0%{?rhel}
-BuildRequires:  perl(Return::Type) >= 0.004
+%if !0%{?perl_bootstrap:1}
+BuildRequires:  perl(Return::Type) >= 0.007
 BuildRequires:  perl(Types::Path::Tiny)
+BuildRequires:  perl(Validation::Class) >= 7.900017
+BuildRequires:  perl(Validation::Class::Simple)
 %endif
 # Dependencies
 Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
@@ -123,8 +131,10 @@ Recommends:     perl(Type::Tie)
 
 # Optional Modules not yet available in EPEL-8
 #TODO: BuildRequires:  perl(Class::InsideOut) >= 1.13
+#TODO: BuildRequires:  perl(Data::Constraint)
 #TODO: BuildRequires:  perl(Kavorka)
 #TODO: BuildRequires:  perl(Moops)
+#TODO: BuildRequires:  perl(MooX::TypeTiny)
 #TODO: BuildRequires:  perl(MouseX::Types::Common) >= 0.001000
 #TODO: BuildRequires:  perl(Regexp::Util) >= 0.003
 #TODO: BuildRequires:  perl(Switcheroo)
@@ -156,15 +166,12 @@ perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
 %{make_install}
 %{_fixperms} -c %{buildroot}
 
-# This file should not be present
-rm %{buildroot}%{_mandir}/man3/Type::CONTRIBUTING.3*
-
 %check
 make test EXTENDED_TESTING=1
 
 %files
 %license COPYRIGHT LICENSE
-%doc Changes CONTRIBUTING.pod CREDITS NEWS README
+%doc Changes CONTRIBUTING CREDITS NEWS README
 %{perl_vendorlib}/Devel/
 %{perl_vendorlib}/Error/
 %{perl_vendorlib}/Eval/
@@ -190,19 +197,28 @@ make test EXTENDED_TESTING=1
 %{_mandir}/man3/Type::Registry.3*
 %{_mandir}/man3/Type::Tiny.3*
 %{_mandir}/man3/Type::Tiny::Class.3*
+%{_mandir}/man3/Type::Tiny::ConstrainedObject.3*
 %{_mandir}/man3/Type::Tiny::Duck.3*
 %{_mandir}/man3/Type::Tiny::Enum.3*
 %{_mandir}/man3/Type::Tiny::Intersection.3*
 %{_mandir}/man3/Type::Tiny::Manual.3*
+%{_mandir}/man3/Type::Tiny::Manual::AllTypes.3*
 %{_mandir}/man3/Type::Tiny::Manual::Coercions.3*
+%{_mandir}/man3/Type::Tiny::Manual::Contributing.3*
+%{_mandir}/man3/Type::Tiny::Manual::Installation.3*
 %{_mandir}/man3/Type::Tiny::Manual::Libraries.3*
+%{_mandir}/man3/Type::Tiny::Manual::NonOO.3*
 %{_mandir}/man3/Type::Tiny::Manual::Optimization.3*
 %{_mandir}/man3/Type::Tiny::Manual::Params.3*
 %{_mandir}/man3/Type::Tiny::Manual::Policies.3*
+%{_mandir}/man3/Type::Tiny::Manual::UsingWithClassTiny.3*
 %{_mandir}/man3/Type::Tiny::Manual::UsingWithMoo.3*
+%{_mandir}/man3/Type::Tiny::Manual::UsingWithMoo2.3*
+%{_mandir}/man3/Type::Tiny::Manual::UsingWithMoo3.3*
 %{_mandir}/man3/Type::Tiny::Manual::UsingWithMoose.3*
 %{_mandir}/man3/Type::Tiny::Manual::UsingWithMouse.3*
 %{_mandir}/man3/Type::Tiny::Manual::UsingWithOther.3*
+%{_mandir}/man3/Type::Tiny::Manual::UsingWithTestMore.3*
 %{_mandir}/man3/Type::Tiny::Role.3*
 %{_mandir}/man3/Type::Tiny::Union.3*
 %{_mandir}/man3/Type::Tiny::_HalfOp.3*
@@ -226,6 +242,10 @@ make test EXTENDED_TESTING=1
 %{_mandir}/man3/Test::TypeTiny.3*
 
 %changelog
+* Sat Jan  1 2022 Paul Howarth <paul@city-fan.org> - 1.012004-0
+- Update to 1.012004 (see Changes file for details)
+- Bootstrap for EPEL
+
 * Fri Oct 25 2019 Paul Howarth <paul@city-fan.org> - 1.004004-2
 - Prep for EPEL-8
   - Use author-independent source URL
diff --git a/sources b/sources
index 456583e..52e812a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Type-Tiny-1.004004.tar.gz) = a1e09c5a3369e0a9ea8e172d86e68e818a720c5c4d633103a442fe389f7a8a7b4a03b2487ffd09f184caf4eca94ef471cc9293b04557b8d4dd260649b4121673
+SHA512 (Type-Tiny-1.012004.tar.gz) = 26b861f1e9caad5717f14eb0a6c71010f0306b614292fdc5ee95041ebdd2035ac6cfd4a6a186943479de630f3ff143914671111f5cec86bc4c08842cec30d2af