diff --git a/libsndfile.spec b/libsndfile.spec
index 0f8fdd3..40f19b0 100644
--- a/libsndfile.spec
+++ b/libsndfile.spec
@@ -1,14 +1,21 @@
 Summary:	Library for reading and writing sound files
 Name:		libsndfile
 Version:	1.0.20
-Release:	2%{?dist}
+Release:	4%{?dist}
 License:	LGPLv2+
 Group:		System Environment/Libraries
 URL:		http://www.mega-nerd.com/libsndfile/
 Source0:	http://www.mega-nerd.com/libsndfile/libsndfile-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
-BuildRequires:	alsa-lib-devel, pkgconfig, flac-devel, sqlite-devel, libogg-devel, jack-audio-connection-kit-devel
+BuildRequires:	alsa-lib-devel
+BuildRequires:	flac-devel
+BuildRequires:	jack-audio-connection-kit-devel
+BuildRequires:	libogg-devel
+BuildRequires:	libvorbis-devel
+BuildRequires:	pkgconfig
+BuildRequires:	sqlite-devel
+
 Provides:	%{name}-octave = %{version}-%{release}
 
 
@@ -32,15 +39,39 @@ AIFF, AU, WAV, and others through one standard interface.
 This package contains files needed to develop with libsndfile.
 
 
+%package utils
+Summary:	Command Line Utilities for libsndfile
+Group:		Applications/Multimedia
+Requires:	%{name} = %{version}-%{release}
+Obsoletes:	libsndfile < 1.0.20-4
+
+
+%description utils
+libsndfile is a C library for reading and writing sound files such as
+AIFF, AU, WAV, and others through one standard interface.
+This package contains commandline utilities for libsndfile.
+
+
 %prep
 %setup -q
 
+# Fix encoding
+iconv -f iso8859-1 -t utf8 ChangeLog -o tmpfile
+touch -r ChangeLog tmpfile
+mv -f tmpfile ChangeLog
+
 %build
 %configure \
 	--disable-dependency-tracking \
 	--enable-sqlite \
 	--enable-alsa \
-	--enable-largefile
+	--enable-largefile \
+	--enable-shave=no
+
+# Get rid of rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make %{?_smp_mflags}
 
 
@@ -85,7 +116,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING AUTHORS README NEWS ChangeLog
+%doc COPYING AUTHORS README NEWS
+%{_libdir}/%{name}.so.*
+
+%files utils
+%defattr(-,root,root,-)
 %{_bindir}/sndfile-info
 %{_bindir}/sndfile-play
 %{_bindir}/sndfile-convert
@@ -97,12 +132,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/sndfile-info.1*
 %{_mandir}/man1/sndfile-play.1*
 %{_mandir}/man1/sndfile-convert.1*
-%{_libdir}/%{name}.so.*
 
 
 %files devel
 %defattr(-,root,root,-)
 %doc __docs/*
+%doc ChangeLog
 %exclude %{_libdir}/%{name}.la
 %{_includedir}/sndfile.h
 %{_includedir}/sndfile.hh
@@ -113,6 +148,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Nov 14 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1.0.20-4
+- Split utils into a subpackage
+
+* Sat Nov 14 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1.0.20-3
+- Add FLAC/Ogg/Vorbis support (BR: libvorbis-devel)
+- Make build verbose
+- Remove rpath
+- Fix ChangeLog encoding
+- Move the big Changelog to the devel package
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.20-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild