diff --git a/xosd.spec b/xosd.spec
index 46b93d4..83e434e 100644
--- a/xosd.spec
+++ b/xosd.spec
@@ -2,21 +2,17 @@ Name:           xosd
 Version:        2.2.14
 Release:        15%{?dist}
 Summary:        On-screen display library for X
-
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.ignavus.net/software.html
 Source:         http://ftp.debian.org/debian/pool/main/x/xosd/%{name}_%{version}.orig.tar.gz
 Patch0:         %{name}-aclocal18.patch
 Patch1:         %{name}-defaults.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:  libX11-devel
 BuildRequires:  libXext-devel
 BuildRequires:  libXinerama-devel
 # As of 2.2.14, the default font *must* be found, even if not used (#183971)
 Requires:       xorg-x11-fonts-base
-
 # XMMS is dead, gdk-pixbuf-0 is dead. Dropping xmms plug-in.
 Obsoletes:      xmms-%{name} < 2.2.14-15
 Obsoletes:      %{name}-xmms <= 2.2.12
@@ -43,7 +39,9 @@ on-screen display.
 %patch0 -p0
 %patch1 -p1
 for f in ChangeLog man/xosd_{create,destroy,display,is_onscreen,set_bar_length}.3 ; do
-    iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
+    iconv -f iso-8859-1 -t utf-8 "$f" > "${f}.utf8"
+    touch -r "$f" "${f}.utf8"
+    mv "${f}.utf8" "$f"
 done
 
 
@@ -51,28 +49,23 @@ done
 %configure --disable-dependency-tracking --disable-static \
     --disable-gtktest --disable-gdk_pixbuftest \
     --disable-new-plugin --disable-old-plugin \
-    --disable-beep_media_player_plugin
+    --disable-beep_media_player_plugin\
+    --enable-xinerama
 make %{?_smp_mflags}
 %{__perl} -pi -e "s|$RPM_OPT_FLAGS\\s*|| ; s|\\s*-Wall||" script/xosd-config
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT{%{_libdir},%{xmms_plugdir}}/*.la
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/osd_cat
 %{_libdir}/libxosd.so.*
@@ -80,7 +73,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/osd_cat.1*
 
 %files devel
-%defattr(-,root,root,-)
 %{_bindir}/xosd-config
 %{_includedir}/xosd.h
 %{_libdir}/libxosd.so
@@ -92,6 +84,7 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Nov 24 2011 Petr Pisar <ppisar@redhat.com> - 2.2.14-15
 - Disable XMMS plug-in because gdk-pixpuf-0 has been removed
 - Remove build-optional static library
+- Clean spec file up 
 
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.14-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild