diff --git a/xorg-x11-xbitmaps.spec b/xorg-x11-xbitmaps.spec
index 645ea42..c615503 100644
--- a/xorg-x11-xbitmaps.spec
+++ b/xorg-x11-xbitmaps.spec
@@ -9,9 +9,9 @@ Release: 4
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/data/%{pkgname}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/data/xbitmaps-%{version}.tar.bz2
 
 # NOTE: This dependency on xorg-x11-filesystem is required to work around
 # a nasty upgrade problem when going from FC4->FC5 or monolithic to