diff --git a/fribidi.spec b/fribidi.spec
index b291f98..0e608b2 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,29 +1,29 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 0.10.7
-Release: 5.1
+Release: 6%{?dist}
 URL: http://fribidi.org
-Source0: %{name}-%{version}.tar.gz
+Source0: http://fribidi.org/download/fribidi/%{name}-%{version}.tar.gz
 Patch0: fribidi-0.10.7-multiarchdevel.patch
 License: LGPL
 Group: System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: automake, autoconf, libtool
 
 %description
-A library to handle bidirectional scripts (eg. hebrew, arabic), so that
+A library to handle bidirectional scripts (eg. Hebrew, Arabic), so that
 the display is done in the proper way; while the text data itself is
 always written in logical order.
 
 %package devel
-Summary: Libraries and include files for fribidi
+Summary: Libraries and include files for FriBidi
 Group: System Environment/Libraries
-Requires: %name = %{version}
+Requires: %name = %{version}-%{release}
 Requires: pkgconfig
 
 %description devel
 Include files and libraries needed for developing applications which use
-fribidi.
+FriBidi.
 
 %prep
 %setup -q
@@ -33,12 +33,12 @@ fribidi.
 aclocal
 autoconf
 automake
-%configure
-make
+%configure --disable-static
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make DESTDIR=$RPM_BUILD_ROOT install
 
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 
@@ -50,20 +50,22 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
-%doc README AUTHORS COPYING ChangeLog TODO THANKS NEWS
+%defattr(-,root,root,-)
+%doc README AUTHORS COPYING ChangeLog THANKS NEWS TODO
 %{_bindir}/fribidi
 %{_libdir}/libfribidi.so.*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/fribidi-config
 %{_includedir}/fribidi
-%{_libdir}/libfribidi.a
 %{_libdir}/libfribidi.so
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Feb 05 2007 Caolan McNamara <caolanm@redhat.com> 0.10.7-6
+- Resolves: rhbz#225771 spec cleanups
+
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 0.10.7-5.1
 - rebuild