diff --git a/mingw-expat.spec b/mingw-expat.spec
index e5b30ce..6100057 100644
--- a/mingw-expat.spec
+++ b/mingw-expat.spec
@@ -71,7 +71,7 @@ Static version of the MinGW Windows expat XML parser library.
 
 
 %prep
-%setup -q -n expat-%{version}
+%autosetup -p1 -n expat-%{version}
 
 
 %build
@@ -80,14 +80,15 @@ Static version of the MinGW Windows expat XML parser library.
 
 
 %install
-%mingw_make_install DESTDIR=$RPM_BUILD_ROOT
+%mingw_make_install
 
 # Remove .la files
-find $RPM_BUILD_ROOT -name "*.la" -delete
+find %{buildroot} -name "*.la" -delete
 
 # Remove documentation which duplicates that found in the native package.
-rm -r $RPM_BUILD_ROOT%{mingw32_docdir}
-rm -r $RPM_BUILD_ROOT%{mingw64_docdir}
+rm -r %{buildroot}%{mingw32_docdir}
+rm -r %{buildroot}%{mingw64_docdir}
+
 
 # Win32
 %files -n mingw32-expat