diff --git a/MouseX-Getopt-0.36-GLD-spacing.patch b/MouseX-Getopt-0.36-GLD-spacing.patch
deleted file mode 100644
index c616220..0000000
--- a/MouseX-Getopt-0.36-GLD-spacing.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- t/104_override_usage.t
-+++ t/104_override_usage.t
-@@ -49,10 +49,16 @@ use Test::Exception;
- \t--foo              A foo
- }
-         :
-+         $Getopt::Long::Descriptive::VERSION == 0.099 ?
-          qq{usage: 104_override_usage.t [-?] [long options...]
- \t-? --usage --help    Prints this usage information.
- \t--foo INT            A foo
- }
-+        :
-+         qq{usage: 104_override_usage.t [-?] [long options...]
-+\t-? --usage --help  Prints this usage information.
-+\t--foo INT          A foo
-+}
- 
-      ];
- 
---- t/110_sort_usage_by_attr_order.t
-+++ t/110_sort_usage_by_attr_order.t
-@@ -34,7 +34,7 @@ usage: 110_sort_usage_by_attr_order.t [-
-     --bar              Documentation for "bar"
-     --baz              Documentation for "baz"
- USAGE
--if ( $Getopt::Long::Descriptive::VERSION >= 0.099 )
-+if ( $Getopt::Long::Descriptive::VERSION == 0.099 )
- {
- $expected = <<'USAGE';
- usage: 110_sort_usage_by_attr_order.t [-?] [long options...]
-@@ -44,6 +44,16 @@ usage: 110_sort_usage_by_attr_order.t [-
-     --baz STR            Documentation for "baz"
- USAGE
- }
-+if ( $Getopt::Long::Descriptive::VERSION >= 0.100 )
-+{
-+$expected = <<'USAGE';
-+usage: 110_sort_usage_by_attr_order.t [-?] [long options...]
-+    -? --usage --help  Prints this usage information.
-+    --foo STR          Documentation for "foo"
-+    --bar STR          Documentation for "bar"
-+    --baz STR          Documentation for "baz"
-+USAGE
-+}
- $expected =~ s/^[ ]{4}/\t/xmsg;
- is($obj->usage->text, $expected, 'Usage text has nicely sorted options');
- 
diff --git a/perl-MouseX-Getopt.spec b/perl-MouseX-Getopt.spec
index 1187378..65c5ce3 100644
--- a/perl-MouseX-Getopt.spec
+++ b/perl-MouseX-Getopt.spec
@@ -1,21 +1,16 @@
 Name:		perl-MouseX-Getopt
 Summary:	Mouse role for processing command line options
-Version:	0.36
-Release:	8%{?dist}
+Version:	0.37
+Release:	1%{?dist}
 License:	GPL+ or Artistic
 URL:		http://search.cpan.org/dist/MouseX-Getopt/
 Source0:	http://search.cpan.org/CPAN/authors/id/G/GF/GFUJI/MouseX-Getopt-%{version}.tar.gz
-Patch0:		MouseX-Getopt-0.36-GLD-spacing.patch
 BuildArch:	noarch
 # Module Build
 BuildRequires:	perl
 BuildRequires:	perl-generators
-BuildRequires:	perl(File::Basename)
-BuildRequires:	perl(File::Copy)
-BuildRequires:	perl(File::Spec)
-BuildRequires:	perl(Module::Build) >= 0.38
+BuildRequires:	perl(Module::Build::Tiny) >= 0.035
 BuildRequires:	perl(strict)
-BuildRequires:	perl(utf8)
 BuildRequires:	perl(warnings)
 # Module Runtime
 BuildRequires:	perl(Carp)
@@ -26,6 +21,7 @@ BuildRequires:	perl(Mouse::Meta::Attribute)
 BuildRequires:	perl(Mouse::Role)
 BuildRequires:	perl(Mouse::Util::TypeConstraints)
 # Test Suite
+BuildRequires:	perl(File::Spec)
 BuildRequires:	perl(Mouse::Meta::Class)
 BuildRequires:	perl(Scalar::Util)
 BuildRequires:	perl(Test::Exception) >= 0.21
@@ -52,10 +48,6 @@ objects using parameters passed in from the command line.
 %prep
 %setup -q -n MouseX-Getopt-%{version}
 
-# Fix tests for GLD help output again
-# https://github.com/gfx/mousex-getopt/pull/10
-%patch0
-
 %build
 perl Build.PL --installdirs=vendor
 ./Build
@@ -83,6 +75,11 @@ perl Build.PL --installdirs=vendor
 %{_mandir}/man3/MouseX::Getopt::Strict.3*
 
 %changelog
+* Wed Jul 13 2016 Paul Howarth <paul@city-fan.org> - 0.37-1
+- Update to 0.37
+  - Cope with GLD output changes in version 0.100 (GH#10)
+- Switch to Module::Build::Tiny flow
+
 * Tue Jul 12 2016 Paul Howarth <paul@city-fan.org> - 0.36-8
 - Fix FTBFS with Geopt::Long::Descriptive 0.100
 
diff --git a/sources b/sources
index d70904b..41e4e38 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6e4e4a14c431d1d7d253650947ae9072  MouseX-Getopt-0.36.tar.gz
+080b1895635b525f2b9792a672b2569e  MouseX-Getopt-0.37.tar.gz