diff --git a/.gitignore b/.gitignore
index 2f87adc..7f1111d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-Class-MethodMaker-2.16.tar.gz
-/Class-MethodMaker-2.17.tar.gz
-/Class-MethodMaker-2.18.tar.gz
+/Class-MethodMaker-2.19.tar.gz
diff --git a/perl-Class-MethodMaker.spec b/perl-Class-MethodMaker.spec
index 8db86d5..8647f06 100644
--- a/perl-Class-MethodMaker.spec
+++ b/perl-Class-MethodMaker.spec
@@ -1,12 +1,12 @@
 Name:           perl-Class-MethodMaker
-Version:        2.18
-Release:        9%{?dist}
+Version:        2.19
+Release:        1%{?dist}
 Summary:        Perl module for creating generic object-oriented methods
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/~schwigon/Class-MethodMaker/
-Source0:        http://www.cpan.org/authors/id/S/SC/SCHWIGON/Class-MethodMaker-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/S/SC/SCHWIGON/class-methodmaker/Class-MethodMaker-%{version}.tar.gz
 
 BuildRequires:  perl
 BuildRequires:  perl(Config)
@@ -67,37 +67,34 @@ Class::MethodMaker solves the problem of having to continually write accessor
 methods for your objects that perform standard tasks.
 
 %prep
-%setup -q -T -c
-%setup -q -T -D -a0
+%setup -q -n Class-MethodMaker-%{version}
 
 %build
-cd Class-MethodMaker-%{version}
 %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
 make %{?_smp_mflags}
-cd ..
 
 %install
-cd Class-MethodMaker-%{version}
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-cd ..
 find $RPM_BUILD_ROOT -type f -a \( -name .packlist \
   -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 %check
-cd Class-MethodMaker-%{version}
 make test
-cd ..
 
 %files
-%defattr(-,root,root,-)
-%doc Class-MethodMaker-%{version}/Changes Class-MethodMaker-%{version}/README Class-MethodMaker-%{version}/TODO
+%doc Changes README TODO
 %{perl_vendorarch}/Class/
 %{perl_vendorarch}/auto/*
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Dec 26 2013 Ralf Corsépius <corsepiu@fedoraproject.org> - 2.19-1
+- Upstream update.
+- Fix up Source0:-URL.
+- Rework spec.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.18-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index bf93853..33c0dd3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-99435d78e0a1754b102fe39597c6c3df  Class-MethodMaker-2.18.tar.gz
+c1f3dc07faf952be9b2e30e718486be6  Class-MethodMaker-2.19.tar.gz