diff --git a/.gitignore b/.gitignore
index e5df25e..96ec0b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /Mail-Message-3.009.tar.gz
 /Mail-Message-3.010.tar.gz
 /Mail-Message-3.011.tar.gz
+/Mail-Message-3.012.tar.gz
diff --git a/perl-Mail-Message.spec b/perl-Mail-Message.spec
index 1dbb6c2..d720260 100644
--- a/perl-Mail-Message.spec
+++ b/perl-Mail-Message.spec
@@ -1,31 +1,32 @@
 Name:		perl-Mail-Message
-Version:	3.011
-Release:	3%{?dist}
+Version:	3.012
+Release:	1%{?dist}
 Summary:	MIME message handling
 License:	GPL+ or Artistic
 URL:		https://metacpan.org/release/Mail-Message
-Source0:	https://cpan.metacpan.org/authors/id/M/MA/MARKOV/Mail-Message-%{version}.tar.gz
+Source0:	https://cpan.metacpan.org/modules/by-module/Mail/Mail-Message-%{version}.tar.gz
+BuildArch:	noarch
+# Build
+BuildRequires:	coreutils
+BuildRequires:	make
 BuildRequires:	perl-generators
 BuildRequires:	perl-interpreter
+BuildRequires:	perl(ExtUtils::MakeMaker) >= 6.76
+# Runtime
 BuildRequires:	perl(base)
 BuildRequires:	perl(Carp)
 BuildRequires:	perl(Cwd)
-BuildRequires:	perl(Data::Dumper)
 BuildRequires:	perl(Date::Format)
 BuildRequires:	perl(Date::Parse)
-%if !%{defined perl_bootstrap}
-BuildRequires:	perl(Email::Abstract)
-%endif
 BuildRequires:	perl(Email::Simple)
 BuildRequires:	perl(Encode) >= 2.26
 BuildRequires:	perl(Encode::Alias)
 BuildRequires:	perl(Exporter)
-BuildRequires:	perl(ExtUtils::MakeMaker) >= 6.76
 BuildRequires:	perl(File::Basename)
 BuildRequires:	perl(File::Copy)
 BuildRequires:	perl(File::Spec) >= 0.7
 BuildRequires:	perl(File::Temp)
-BuildRequires:	perl(Font::Metrics::TimesRoman)
+BuildRequires:	perl(HTML::FormatPS)
 BuildRequires:	perl(HTML::FormatText) >= 2.01
 BuildRequires:	perl(HTML::TreeBuilder) >= 3.13
 BuildRequires:	perl(integer)
@@ -58,22 +59,27 @@ BuildRequires:	perl(Text::Autoformat)
 BuildRequires:	perl(Time::HiRes) >= 1.51
 BuildRequires:	perl(Time::Zone)
 BuildRequires:	perl(URI) >= 1.23
-BuildRequires:	perl(User::Identity) >= 1.00
+BuildRequires:	perl(User::Identity) >= 1.01
 BuildRequires:	perl(User::Identity::Collection::Emails)
 BuildRequires:	perl(utf8)
 BuildRequires:	perl(vars)
 BuildRequires:	perl(warnings)
-# Remember when we could assume build environments had common packages?
-# Pepperidge Farm remembers.
-BuildRequires:	coreutils, make, glibc-common
-BuildArch:	noarch
-Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-# Explicit run requires
+# Test Suite
+BuildRequires:	perl(Data::Dumper)
+# Optional Tests
+%if !%{defined perl_bootstrap}
+BuildRequires:	perl(Email::Abstract)
+%endif
+# Dependencies
+Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:	perl(Date::Parse)
 %if !%{defined perl_bootstrap}
 Requires:	perl(Mail::Transport::Send)
 %endif
+Requires:	perl(Net::Domain)
+Requires:	perl(Time::HiRes) >= 1.51
 Requires:	perl(Time::Zone)
+Requires:	perl(User::Identity) >= 1.01
 
 # I'm not sure why these provides aren't getting picked up automatically.
 Provides:	perl(Mail::Message::Body::Construct) = %{version}
@@ -94,38 +100,39 @@ MIME message handling code, formerly part of the Mail::Box package.
 # The licensing on these test files is unclear.
 # They seem to contain content posted publicly to usenet
 # so there is an argument that the content is distributable
-# but its not under a Free license.
+# but it's not under a Free license.
 # We delete these files to resolve the issue.
 # https://rt.cpan.org/Public/Bug/Display.html?id=120149
 rm -rf t/203-mlfolder.mbox t/204-sgfolder.mbox
 rm -rf t/203head-listgroup.t t/204head-spamgroup.t
 
-%{?perl_default_filter}
-
 %build
-yes y |%{__perl} Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1
+yes y |perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
 make
 
 %install
-make pure_install DESTDIR=$RPM_BUILD_ROOT
-%{_fixperms} $RPM_BUILD_ROOT/*
-# Fix file encoding
-recode()
-{
-	iconv -f "$2" -t utf-8 < "$1" > "${1}_"
-	mv -f "${1}_" "$1"
-}
-recode $RPM_BUILD_ROOT%{_mandir}/man3/Mail::Message::Field.3pm iso-8859-1
+%{make_install}
+%{_fixperms} -c %{buildroot}
 
 %check
 make test
 
 %files
-%doc README ChangeLog
+%doc ChangeLog README README.md
 %{perl_vendorlib}/Mail/
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/Mail::*.3*
 
 %changelog
+* Tue Mar  1 2022 Paul Howarth <paul@city-fan.org> - 3.012-1
+- Update to 3.012
+- Use author-independent source URL
+- Classify buildreqs by usage
+- Drop redundant %%{?perl_default_filter}
+- Drop recoding of Mail::Message::Field manpage since it has changed to UTF-8
+  coding upstream
+- Package README.md too (guide for contributors)
+- Fix permissions verbosely
+
 * Wed Jan 26 2022 Paul Howarth <paul@city-fan.org> - 3.011-3
 - EPEL-9 post-bootstrap rebuild
 
diff --git a/sources b/sources
index a0c83fe..3aa5981 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Mail-Message-3.011.tar.gz) = 91253e2a23dabc435b550dd4f5471b94eff9a11a313323db45279c3d5be354e9bf7220438a399736d99344be98a96a67a2e752bf907bd02e0eb813e14fe9096c
+SHA512 (Mail-Message-3.012.tar.gz) = a29101f3e4ba30ca49e6e1fab39d3358df02ab95a99d6a9bd7e3d4e0d23e0cc3e8bf407adc7d21b83e52157d660014374157aeb44085e88ad2e4fb0b4553b8b4