diff --git a/perl-ExtUtils-CBuilder.spec b/perl-ExtUtils-CBuilder.spec
index 4fdf574..ca4d2d0 100644
--- a/perl-ExtUtils-CBuilder.spec
+++ b/perl-ExtUtils-CBuilder.spec
@@ -2,7 +2,7 @@
 
 Name:           perl-ExtUtils-CBuilder
 Version:        0.05
-Release:        0.fdr.1.2
+Release:        1
 Epoch:          0
 Summary:        Compile and link C code for Perl modules
 
@@ -14,7 +14,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-BuildRequires:  perl(Module::Build)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -29,18 +28,20 @@ purposes as well.
 
 
 %build
-%{__perl} Build.PL installdirs=vendor
-./Build
+%{__perl} Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-./Build install destdir=$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 ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
 %check || :
-./Build test
+make test
 
 
 %clean
@@ -55,6 +56,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Nov 29 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.05-1
+- Revert to building with ExtUtils::MakeMaker to eliminate a build
+  dependency loop with Module::Build.
+
 * Fri Oct 15 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.05-0.fdr.1
 - Update to 0.05.
 - Building procedure: Makefile.PL -> Build.PL.