diff --git a/libsoup.spec b/libsoup.spec
index 80859b8..6b2b02a 100644
--- a/libsoup.spec
+++ b/libsoup.spec
@@ -7,8 +7,8 @@ License: LGPL
 Group: Development/Libraries
 Summary: Soup, an HTTP library implementation
 URL: ftp://ftp.gnome.org/pub/gnome/sources/libsoup/
-BuildRoot: %{_tmppath}/%{name}-root
-Source: %{name}-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Source: libsoup-%{version}.tar.bz2
 
 ### Dependencies ###
 
@@ -48,7 +48,7 @@ Libsoup is an HTTP library implementation in C. This package allows
 you to develop applications that use the libsoup library.
 
 %prep
-%setup -q
+%setup -q -n libsoup-%{version}
 
 %build
 %configure --disable-gtk-doc