diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 649f88d..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: uuid
-# $Id$
-NAME := uuid
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/uuid.spec b/uuid.spec
index 951d5db..b4d7fb1 100644
--- a/uuid.spec
+++ b/uuid.spec
@@ -1,6 +1,6 @@
 Name:           uuid
 Version:        1.5.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Universally Unique Identifier library
 License:        MIT
 Group:          System Environment/Libraries
@@ -50,6 +50,7 @@ C++ development headers and libraries for OSSP uuid.
 %package perl
 Summary:        Perl support for Universally Unique Identifier library
 Group:          Development/Libraries
+BuildRequires:  perl(ExtUtils::MakeMaker)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:       %{name} = %{version}-%{release}
 
@@ -144,9 +145,9 @@ make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 
 find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \;
+find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
-chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 popd
 
 # Install the PHP module.
@@ -233,6 +234,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libossp-uuid_dce.so
 
 %changelog
+* Tue Apr 17 2007 Steven Pritchard <steve@kspei.com> 1.5.1-3
+- Fix find option order.
+- Use fixperms macro instead of our own chmod incantation.
+- BR ExtUtils::MakeMaker.
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli@licr.org> 1.5.1-2
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21