diff --git a/.rpmlint b/perl-YAML-Syck.rpmlintrc
similarity index 100%
rename from .rpmlint
rename to perl-YAML-Syck.rpmlintrc
diff --git a/perl-YAML-Syck.spec b/perl-YAML-Syck.spec
index ad99f6f..10f3e45 100644
--- a/perl-YAML-Syck.spec
+++ b/perl-YAML-Syck.spec
@@ -6,43 +6,51 @@
 %endif
 
 Name:           perl-YAML-Syck
-Version:        1.30
-Release:        7%{?dist}
+Version:        1.31
+Release:        1%{?dist}
 Summary:        Fast, lightweight YAML loader and dumper
 License:        BSD and MIT
 URL:            https://metacpan.org/release/YAML-Syck
-Source0:        https://cpan.metacpan.org/authors/id/T/TO/TODDR/YAML-Syck-%{version}.tar.gz
+Source0:        https://cpan.metacpan.org/modules/by-module/YAML/YAML-Syck-%{version}.tar.gz
+# Module Build
 BuildRequires:  coreutils
 BuildRequires:  findutils
 BuildRequires:  gcc
 BuildRequires:  make
-BuildRequires:  perl-interpreter
 BuildRequires:  perl-devel
 BuildRequires:  perl-generators
-# Keep bundled inc::Module::Install to break cycle
-# perl-Module-Install → perl-YAML-Tiny → perl-YAML-Syck
-BuildRequires:  perl(Cwd)
-BuildRequires:  perl(File::Path)
-BuildRequires:  perl(File::Spec)
-BuildRequires:  perl(lib)
+BuildRequires:  perl-interpreter
 BuildRequires:  perl(ExtUtils::MakeMaker)
-# Run-time
+# Dependencies of bundled ExtUtils::HasCompiler
+BuildRequires:  perl(base)
+BuildRequires:  perl(Carp)
+BuildRequires:  perl(Config)
+BuildRequires:  perl(DynaLoader)
+BuildRequires:  perl(ExtUtils::Mksymlists)
+BuildRequires:  perl(File::Basename)
+BuildRequires:  perl(File::Spec::Functions)
+BuildRequires:  perl(File::Temp)
+# Module Runtime
 BuildRequires:  perl(constant)
 # DynaLoader not used if XSLoader is available
 BuildRequires:  perl(Exporter)
 BuildRequires:  perl(strict)
 BuildRequires:  perl(vars)
 BuildRequires:  perl(XSLoader)
-# Tests
+# Test Suite
 BuildRequires:  perl(Data::Dumper)
+BuildRequires:  perl(FindBin)
 BuildRequires:  perl(IO::File)
 BuildRequires:  perl(Storable)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Tie::Hash)
+BuildRequires:  perl(utf8)
+BuildRequires:  perl(warnings)
+# Optional Tests
 %if %{with perl_YAML_Syck_enables_optional_test}
-# Optional tests
 BuildRequires:  perl(Devel::Leak)
 BuildRequires:  perl(JSON)
+BuildRequires:  perl(Symbol)
 %endif
 # Dependencies
 Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
@@ -60,10 +68,10 @@ structures to YAML strings, and the other way around.
 %setup -q -n YAML-Syck-%{version}
 
 # Unbundle core and unused modules
-rm -rvf inc/{parent.pm,PerlIO.pm,Scalar/,Test/}
+rm -rvf inc/{Module,Scalar,Test}
 
 %build
-perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
+perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags} -DI_STDLIB=1 -DI_STRING=1"
 make %{?_smp_mflags}
 
 %install
@@ -85,6 +93,14 @@ make test
 %{_mandir}/man3/YAML::Syck.3*
 
 %changelog
+* Fri Oct 26 2018 Paul Howarth <paul@city-fan.org> - 1.31-1
+- Update to 1.31
+  - Switch to ExtUtils::MakeMaker for builder
+  - Switch official issue tracker and repo to github
+  - MANIFEST warning is now fixed; also shipping additional tests because of
+    this
+- Make sure <stdlib.h> and <string.h> are included, quietens lots of warnings
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.30-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index ec29532..7f6b04f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (YAML-Syck-1.30.tar.gz) = 3c38c77589c12652b456ad95120b3223df9e96475a9478692511bf6207ce81bc61204feaa332dbd913d934c41cf5d6515420961b31c20c9fe245373e81ecdda4
+SHA512 (YAML-Syck-1.31.tar.gz) = 5177f415f1f3f0d46b9fc51e43478da627edc3d7e89d9baf095fdda2cd9f93eb46784429f1665fead2b3377a2749c6fb937a91136bbe713d79000c12206a83f5