diff --git a/xorg-x11-xauth.spec b/xorg-x11-xauth.spec
index d2f3631..3e3f027 100644
--- a/xorg-x11-xauth.spec
+++ b/xorg-x11-xauth.spec
@@ -4,12 +4,12 @@ Summary: X.Org X11 X authority utilities
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
 Release: 1.2
-# FIXME: Remove Epoch line if package gets renamed
+# NOTE: Remove Epoch line if package gets renamed
 Epoch: 1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releasesX11R7.0-RC4/everything/%{pkgname}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releasesX11R7.0/src/everything/%{pkgname}-%{version}.tar.bz2
 Source10: mkxauth
 Source11: mkxauth.man
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,10 +24,10 @@ Provides: xauth
 Provides: mkxauth
 Obsoletes: XFree86-xauth, mkxauth
 # NOTE: xauth moved from the XFree86 package to XFree86-xauth in
-# XFree86-4.2.0-50.11, so this Conflicts line is required for upgrades
+# XFree86-4.2.0-50.11, so this Obsoletes line is required for upgrades
 # from RHL 8 and older, and RHEL 2.1 to work properly when upgrading to
 # a newer OS release.
-Conflicts: XFree86 < 4.2.0-50.11
+Obsoletes: XFree86 < 4.2.0-50.11
 
 %description
 xauth is used to edit and display the authorization information
@@ -57,19 +57,17 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc
-%dir %{_bindir}
 %{_bindir}/xauth
 %{_bindir}/mkxauth
-%dir %{_mandir}
-%dir %{_mandir}/man1
+#%dir %{_mandir}/man1x
 %{_mandir}/man1/xauth.1x*
 %{_mandir}/man1/mkxauth.1x*
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1:1.0.1-1.2
+* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> 1:1.0.1-1.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1:1.0.1-1.1
+* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> 1:1.0.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Wed Jan 18 2006 Mike A. Harris <mharris@redhat.com> 1:1.0.1-1