diff --git a/.cvsignore b/.cvsignore
index 2f6195e..e930984 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-Test-MockObject-1.03.tar.gz
+Test-MockObject-1.04.tar.gz
diff --git a/perl-Test-MockObject.spec b/perl-Test-MockObject.spec
index 3180c2a..ea6aa42 100644
--- a/perl-Test-MockObject.spec
+++ b/perl-Test-MockObject.spec
@@ -1,5 +1,5 @@
 Name:           perl-Test-MockObject
-Version:        1.03
+Version:        1.04
 Release:        1%{?dist}
 Summary:        Perl extension for emulating troublesome interfaces
 
@@ -11,6 +11,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
+BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Test::Exception)
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
 BuildRequires:  perl(UNIVERSAL::can) >= 1.11
@@ -31,21 +32,19 @@ Now you have no excuse.)
 
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags}
+%{__perl} Build.PL installdirs=vendor
+./Build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
+./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
 %check
-mv t/0-signature.t t/0-signature.t.disable
-make test
+mv t/developer/0-signature.t t/developer/0-signature.t.disable
+PERL_RUN_ALL_TESTS=1 ./Build test
 
 
 %clean
@@ -60,6 +59,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Mar 30 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.04-1
+- Update to 1.04.
+- Makefile.PL -> Build.PL.
+
 * Mon Mar 13 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.03-1
 - Update to 1.03.
 
diff --git a/sources b/sources
index ccdc0fa..d5b2dc5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b6a13614c61f68ff1cfc4c5609bff947  Test-MockObject-1.03.tar.gz
+03224e5cecd7267c720994eeeb02c376  Test-MockObject-1.04.tar.gz