diff --git a/rest.spec b/rest.spec
index 7e903fb..90868d8 100644
--- a/rest.spec
+++ b/rest.spec
@@ -6,7 +6,7 @@ Summary:        A library for access to RESTful web services
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://moblin.org/projects/librest
-Source0:        http://git.moblin.org/cgit.cgi/lib%{name}/snapshot/lib%{name}-%{version}.tar.bz2
+Source0:        http://git.moblin.org/cgit.cgi/lib%{name}/snapshot/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: glib2-devel
@@ -14,9 +14,6 @@ BuildRequires: libsoup-devel
 BuildRequires: libxml2-devel
 BuildRequires: gtk-doc
 
-# Require these because the git tarball doesn't have the configure built
-BuildRequires: libtool
-
 %description
 This library was designed to make it easier to access web services that
 claim to be "RESTful". A RESTful service should have urls that represent 
@@ -36,14 +33,15 @@ Requires: pkgconfig
 Files for development with %{name}.
 
 %prep
-%setup -q -n librest-%{version}
-
-# Don't run configure from autogen.sh
-sed -i 's|echo|exit 0|g' autogen.sh
-./autogen.sh
+%setup -q
 
 %build
 %configure --disable-static --enable-gtk-doc
+
+# Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_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} V=1
 
 %install
@@ -77,6 +75,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/%{name}-0.6
 
 %changelog
+* Mon Jan 25 2010 Peter Robinson <pbrobinson@gmail.com> 0.6.1-2
+- Move to official tarball release of 0.6.1
+
 * Sat Oct 10 2009 Peter Robinson <pbrobinson@gmail.com> 0.6.1-1
 - New upstream 0.6.1 release