diff --git a/unixODBC.spec b/unixODBC.spec
index 86fdf83..dcee3c0 100644
--- a/unixODBC.spec
+++ b/unixODBC.spec
@@ -1,7 +1,7 @@
 Summary: A complete ODBC driver manager for Linux
 Name: unixODBC
 Version: 2.3.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group: System Environment/Libraries
 URL: http://www.unixODBC.org/
 # Programs are GPL, libraries are LGPL, except News Server library is GPL.
@@ -23,8 +23,6 @@ Conflicts: iodbc
 BuildRequires: automake autoconf libtool libtool-ltdl-devel bison flex
 BuildRequires: readline-devel
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
 %description
 Install unixODBC if you want to access databases through ODBC.
 You will also need the mysql-connector-odbc package if you want to access
@@ -77,8 +75,6 @@ export CFLAGS CXXFLAGS
 make all
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make DESTDIR=$RPM_BUILD_ROOT install
 install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
 
@@ -129,11 +125,7 @@ do
     mv -f devel-so-list.x devel-so-list
 done
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files -f base-so-list
-%defattr(-,root,root)
 %doc README COPYING AUTHORS ChangeLog NEWS doc
 %doc README.fedora
 %config(noreplace) %{_sysconfdir}/odbc*
@@ -144,13 +136,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/odbc_config
 
 %files devel -f devel-so-list
-%defattr(-,root,root)
 %{_includedir}/*
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Jul  4 2013 Honza Horak <hhorak@redhat.com> 2.3.1-6
+- Spec file clean-up
+
 * Thu Jul  4 2013 Honza Horak <hhorak@redhat.com> 2.3.1-5
 - Fix Coverity patch
   Resolves: #981060