diff --git a/.gitignore b/.gitignore
index ea8d84b..fbec8a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 MooseX-AttributeHelpers-0.23.tar.gz
+/MooseX-AttributeHelpers-0.24.tar.gz
diff --git a/MooseX-AttributeHelpers-0.23-Fix-tests-to-cope-radnomized-hash-keys.patch b/MooseX-AttributeHelpers-0.23-Fix-tests-to-cope-radnomized-hash-keys.patch
deleted file mode 100644
index 3a28e40..0000000
--- a/MooseX-AttributeHelpers-0.23-Fix-tests-to-cope-radnomized-hash-keys.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 94d4ecede542aa0ae5e33e1aa68c6d9731bf295e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Fri, 2 Aug 2013 19:09:45 +0200
-Subject: [PATCH] Fix tests to cope radnomized hash keys
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Similar patch is in Moose.
-
-<https://rt.cpan.org/Public/Bug/Display.html?id=81564>
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- t/003_basic_hash.t | 4 ++--
- t/203_trait_hash.t | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/t/003_basic_hash.t b/t/003_basic_hash.t
-index 1f842ae..c21ac52 100644
---- a/t/003_basic_hash.t
-+++ b/t/003_basic_hash.t
-@@ -170,10 +170,10 @@ is_deeply($options->provides, {
- is($options->type_constraint->type_parameter, 'Str', '... got the right container type');
- 
- $stuff->set_option( oink => "blah", xxy => "flop" );
--my @key_value = $stuff->key_value;
-+my @key_value = sort{ $a->[0] cmp $b->[0] } $stuff->key_value;
- is_deeply(
-     \@key_value,
--    [ [ 'xxy', 'flop' ], [ 'quantity', 4 ], [ 'oink', 'blah' ] ],
-+    [ sort{ $a->[0] cmp $b->[0] } [ 'xxy', 'flop' ], [ 'quantity', 4 ], [ 'oink', 'blah' ] ],
-     '... got the right key value pairs'
- );
- 
-diff --git a/t/203_trait_hash.t b/t/203_trait_hash.t
-index 8e876b1..451c0bb 100644
---- a/t/203_trait_hash.t
-+++ b/t/203_trait_hash.t
-@@ -156,10 +156,10 @@ is_deeply($options->provides, {
- is($options->type_constraint->type_parameter, 'Str', '... got the right container type');
- 
- $stuff->set_option( oink => "blah", xxy => "flop" );
--my @key_value = $stuff->key_value;
-+my @key_value = sort{ $a->[0] cmp $b->[0] } $stuff->key_value;
- is_deeply(
-     \@key_value,
--    [ [ 'xxy', 'flop' ], [ 'quantity', 4 ], [ 'oink', 'blah' ] ],
-+    [ sort{ $a->[0] cmp $b->[0] } [ 'xxy', 'flop' ], [ 'quantity', 4 ], [ 'oink', 'blah' ] ],
-     '... got the right key value pairs'
- );
- 
--- 
-1.8.1.4
-
diff --git a/perl-MooseX-AttributeHelpers.spec b/perl-MooseX-AttributeHelpers.spec
index d2f34be..117552c 100644
--- a/perl-MooseX-AttributeHelpers.spec
+++ b/perl-MooseX-AttributeHelpers.spec
@@ -1,21 +1,19 @@
 Name:           perl-MooseX-AttributeHelpers
-Version:        0.23
-Release:        15%{?dist}
+Version:        0.24
+Release:        1%{?dist}
 Summary:        Extended Moose attribute interfaces
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/MooseX-AttributeHelpers/
-Source0:        http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/MooseX-AttributeHelpers-%{version}.tar.gz
-# Perl 5.18 compatibility, CPAN RT#81564
-Patch0:         MooseX-AttributeHelpers-0.23-Fix-tests-to-cope-radnomized-hash-keys.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:        http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/MooseX-AttributeHelpers-%{version}.tar.gz
+
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
-BuildRequires:  perl(Moose)           >= 0.56
+BuildRequires:  perl(Module::Build::Tiny) >= 0.07
+BuildRequires:  perl(Moose) >= 0.56
 BuildRequires:  perl(Test::Exception) >= 0.21
 BuildRequires:  perl(Test::Moose)
-BuildRequires:  perl(Test::More)      >= 0.62
+BuildRequires:  perl(Test::More) >= 0.94
 
 ### auto-added reqs!
 Requires:  perl(Moose) >= 0.56
@@ -29,28 +27,31 @@ used attribute helper methods for more specific types of data.
 
 %prep
 %setup -q -n MooseX-AttributeHelpers-%{version}
-%patch0 -p1
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags}
+%{__perl} Build.PL --installdirs=vendor
+./Build
 
 %install
-make pure_install DESTDIR=%{buildroot}
-
-find %{buildroot} -type f -name .packlist -exec rm -f {} +
-
-%{_fixperms} %{buildroot}/*
+./Build install --destdir=$RPM_BUILD_ROOT --create_packlist=0
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
-make test
+./Build test
 
 %files
-%doc ChangeLog README t/
-%{perl_vendorlib}/*
-%{_mandir}/man3/*
+%doc Changes README t/
+%license LICENSE
+%{perl_vendorlib}/MooseX*
+%{_mandir}/man3/MooseX*
 
 %changelog
+* Wed Aug 19 2015 Emmanuel Seyman <emmanuel@seyman.fr> - 0.24-1
+- Update to 0.24
+- Remove upstreamed patch
+- Switch to the Module::Build::Tiny workflow
+- Clean up spec file
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.23-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index f38338c..a6302c2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ebdd543a211884854b6c87adf25e6e22  MooseX-AttributeHelpers-0.23.tar.gz
+1356bfec2eee9ad87bd5347fc7164244  MooseX-AttributeHelpers-0.24.tar.gz