diff --git a/mingw32-gettext.spec b/mingw32-gettext.spec
index d398595..5f7d5b6 100644
--- a/mingw32-gettext.spec
+++ b/mingw32-gettext.spec
@@ -1,8 +1,5 @@
 %define __strip %{_mingw32_strip}
 %define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
 
 Name:      mingw32-gettext
 Version:   0.18.1.1
@@ -13,11 +10,10 @@ License:   GPLv2+ and LGPLv2+
 Group:     Development/Libraries
 URL:       http://www.gnu.org/software/gettext/
 Source0:   http://ftp.gnu.org/pub/gnu/gettext/gettext-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
 
-BuildRequires: mingw32-filesystem >= 49
+BuildRequires: mingw32-filesystem >= 68
 BuildRequires: mingw32-runtime >= 3.15.1
 BuildRequires: mingw32-gcc
 BuildRequires: mingw32-gcc-c++
@@ -63,8 +59,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT%{_mingw32_datadir}/locale/locale.alias
 rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/charset.alias
@@ -79,12 +73,7 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/info/
 %find_lang %{name} --all-name
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files -f %{name}.lang
-%defattr(-,root,root)
 %doc COPYING
 %{_mingw32_bindir}/autopoint
 %{_mingw32_bindir}/envsubst.exe
@@ -127,7 +116,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_datadir}/aclocal/*m4
 
 %files static
-%defattr(-,root,root,-)
 %{_mingw32_libdir}/libasprintf.a
 %{_mingw32_libdir}/libgettextpo.a
 %{_mingw32_libdir}/libintl.a
@@ -136,6 +124,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Mon May 23 2011 Kalev Lember <kalev@smartlink.ee> - 0.18.1.1-1
 - Update to 0.18.1.1
+- Spec cleanup
 
 * Mon May 23 2011 Kalev Lember <kalev@smartlink.ee> - 0.17-16
 - Removed html documentation and info pages