diff --git a/perl-Exporter-Tiny.spec b/perl-Exporter-Tiny.spec
index df51a38..fcb56e7 100644
--- a/perl-Exporter-Tiny.spec
+++ b/perl-Exporter-Tiny.spec
@@ -1,6 +1,13 @@
+# Test::Warnings introduced in Fedora 18
+%if 0%{?fedora} < 18 && 0%{?rhel} < 7
+%global no_test_warnings 1
+%else
+%global no_test_warnings 0
+%endif
+
 Name:		perl-Exporter-Tiny
-Version:	0.038
-Release:	3%{?dist}
+Version:	0.040
+Release:	1%{?dist}
 Summary:	An exporter with the features of Sub::Exporter but only core dependencies
 License:	GPL+ or Artistic
 Group:		Development/Libraries
@@ -12,16 +19,19 @@ BuildArch:	noarch
 BuildRequires:	perl
 BuildRequires:	perl(ExtUtils::MakeMaker) >= 6.17
 # Module Runtime
-BuildRequires:	perl(B)
 BuildRequires:	perl(Carp)
 BuildRequires:	perl(strict)
 BuildRequires:	perl(warnings)
 # Test Suite
 BuildRequires:	perl(lib)
 BuildRequires:	perl(Test::More) >= 0.47
+# Optional Tests
+BuildRequires:	perl(Test::Fatal)
+%if ! %{no_test_warnings}
+BuildRequires:	perl(Test::Warnings)
+%endif
 # Runtime
 Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
-Requires:	perl(B)
 Requires:	perl(Carp)
 
 # Avoid doc-file dependency on perl(base)
@@ -62,13 +72,27 @@ make test
 rm -rf %{buildroot}
 
 %files
-%doc Changes CONTRIBUTING COPYRIGHT CREDITS LICENSE README
+%if 0%{?_licensedir:1}
+%license COPYRIGHT LICENSE
+%else
+%doc COPYRIGHT LICENSE
+%endif
+%doc Changes CONTRIBUTING CREDITS README
 %doc examples/
 %{perl_vendorlib}/Exporter/
 %{_mandir}/man3/Exporter::Tiny.3pm*
 %{_mandir}/man3/Exporter::Shiny.3pm*
 
 %changelog
+* Wed Sep 17 2014 Paul Howarth <paul@city-fan.org> - 0.040-1
+- Update to 0.040
+  - Document warning and error messages produced by Exporter::Tiny
+  - Exporter::Tiny would previously cause B.pm to be loaded into memory any
+    time it exported anything: it no longer does
+  - No longer die when redefining locally defined subs
+  - Warn when redefining any subs
+- Use %%license where possible
+
 * Wed Aug 27 2014 Jitka Plesnikova <jplesnik@redhat.com> - 0.038-3
 - Perl 5.20 rebuild
 
diff --git a/sources b/sources
index 3d7764a..e5982c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9ab8587a1c95ad7b666fbc43ab76f16e  Exporter-Tiny-0.038.tar.gz
+d3e0fc25ee5e704f52640967c9d862b1  Exporter-Tiny-0.040.tar.gz