diff --git a/perl-Term-Table.spec b/perl-Term-Table.spec
index 00f9ce3..e64bc00 100644
--- a/perl-Term-Table.spec
+++ b/perl-Term-Table.spec
@@ -1,8 +1,12 @@
+# Recognize terminal size
+%bcond_without perl_Term_Table_enables_terminal
+# Respect Unicode rules when breaking lines
+%bcond_without perl_Term_Table_enables_unicode
 %define module Term::Table
 
 Name:           perl-Term-Table
 Version:        0.016
-Release:        2%{?org_tag}%{?dist}
+Release:        3%{?org_tag}%{?dist}
 Summary:        Format a header and rows into a table
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -10,26 +14,55 @@ URL:            http://search.cpan.org/dist/Term-Table/
 Source0:        http://localhost/cpan/authors/id/E/EX/EXODIST/Term-Table-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  perl >= 0:5.008001
+BuildRequires:  make
+BuildRequires:  perl-generators
+BuildRequires:  perl-interpreter
+BuildRequires:  perl(:VERSION) >= 5.8.1
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
+BuildRequires:  perl(strict)
+BuildRequires:  perl(warnings)
+# Run-time:
 BuildRequires:  perl(Carp)
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(Config)
 BuildRequires:  perl(Importer) >= 0.024
 BuildRequires:  perl(List::Util)
+#BuildRequires:  perl(Object::HashBase) >= 0.008
 BuildRequires:  perl(Scalar::Util)
+# Optional run-time:
+%if %{with perl_Term_Table_enables_terminal}
+# Term::ReadKey 2.32 not used if Term::Size::Any is available
+# Prefer Term::Size::Any over Term::ReadKey
 BuildRequires:  perl(Term::Size::Any) >= 0.002
-BuildRequires:  perl(Test2::Tools::Tiny) >= 1.302072
+%endif
+%if %{with perl_Term_Table_enables_unicode}
+BuildRequires:  perl(Unicode::GCString) >= 2013.10
 BuildRequires:  perl(Unicode::LineBreak) >= 2015.06
+%endif
+# Tests:
+BuildRequires:  perl(base)
+BuildRequires:  perl(Test2::API)
+BuildRequires:  perl(Test2::Tools::Tiny) >= 1.302097
+BuildRequires:  perl(Test::More)
+BuildRequires:  perl(utf8)
 Requires:       perl(Carp)
-Requires:       perl(Importer) >= 0.024
 Requires:       perl(List::Util)
 Requires:       perl(Scalar::Util)
-Requires:       perl(Term::Size::Any) >= 0.002
-Requires:       perl(Unicode::LineBreak) >= 2015.06
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Autoreq:        no
-%if %{rhel} >= 8
-Provides:       perl(%{module}) = %{version}
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+Requires:       perl(Importer) >= 0.024
+%if %{with perl_Term_Table_enables_terminal}
+Suggests:       perl(Term::ReadKey) >= 2.32
+# Prefer Term::Size::Any over Term::ReadKey
+Recommends:     perl(Term::Size::Any) >= 0.002
 %endif
+%if %{with perl_Term_Table_enables_unicode}
+Recommends:     perl(Unicode::GCString) >= 2013.10
+Recommends:       perl(Unicode::LineBreak) >= 2015.06
+%endif
+
+
+# Remove under-specified dependencies
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Importer\\)$
+
 
 %description
 This is used by some failing tests to provide diagnostics about what has
@@ -67,7 +100,7 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
-* Mon Jan 27 2025 Jean-Philippe Pialasse <jpp@koozali.org> 0.016-2.sme
+* Mon Jan 27 2025 Jean-Philippe Pialasse <jpp@koozali.org> 0.016-3.sme
 - import to SME11
 
 * Mon Feb 14 2022 Gavin Carr <gavin@openfusion.net> 0.016-1