diff --git a/rhsupport.pub b/rhsupport.pub
deleted file mode 100644
index e16079d..0000000
Binary files a/rhsupport.pub and /dev/null differ
diff --git a/sos.spec b/sos.spec
index 397ab08..ac5636d 100644
--- a/sos.spec
+++ b/sos.spec
@@ -5,22 +5,17 @@
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
 Version: 1.8
-Release: 3%{?dist}
-Group: Applications/System
-# The source for this package was pulled from upstream's svn.  Use the
-# following commands to generate the tarball:
-#  svn --username guest export https://sos.108.redhat.com/svn/sos/tags/r1-7 sos-1.7
-#  tar -czvf sos-1.7.tar.gz sos-1.7
-Source0: %{name}-%{version}.tar.gz
-Source1: rhsupport.pub
+Release: 5%{?dist}
+Group: Application/Tools
+Source0: https://fedorahosted.org/releases/s/o/sos/%{name}-%{version}.tar.gz
 License: GPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
-Url: https://hosted.fedoraproject.org/projects/sos
+Url: http://fedorahosted.org/sos
 BuildRequires: python-devel
 Requires: libxml2-python
 Provides: sysreport = 1.4.3-13
-Obsoletes: sysreport < 1.4.3-13
+Obsoletes: sysreport
 
 %description
 Sos is a set of tools that gathers information about system
@@ -36,40 +31,50 @@ support technicians and developers.
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-install -D -m644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/%{name}/rhsupport.pub
-%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
-
-%find_lang %{name}
-cd $RPM_BUILD_ROOT%{_sbindir}
-ln -s sosreport sysreport
+install -D -m644 gpgkeys/rhsupport.pub ${RPM_BUILD_ROOT}/usr/share/sos/rhsupport.pub
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+ln -s /usr/sbin/sosreport $RPM_BUILD_ROOT/usr/sbin/sysreport
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-%files -f %{name}.lang
+%files
 %defattr(-,root,root,-)
-%{_sbindir}/sosreport
-%{_datadir}/sos/
 %{_bindir}/rh-upload-core
+%{_sbindir}/sosreport
 %{_sbindir}/sysreport
 %{_sbindir}/sysreport.legacy
-%{_datadir}/sysreport
+/usr/share/sysreport
+/usr/share/sos/rhsupport.pub
 %{python_sitelib}/sos/
-%{python_sitelib}/%{name}-0.0.0-py*.egg-info
-%{_mandir}/man1/sosreport.1*
+%{_mandir}/man1/sosreport.1.gz
+%{_localedir}/*/LC_MESSAGES/sos.mo
 %doc README README.rh-upload-core TODO LICENSE ChangeLog
-%config(noreplace) %{_sysconfdir}/sos.conf
+%config %{_sysconfdir}/sos.conf
 
 %changelog
-* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 1.8-3
-- Rebuild for Python 2.6
+* Mon Dec 29 2008 Adam Stokes <ajs at redhat dot com> - 1.8-5
+- removed source defines as python manifest handles this
 
-* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa@redhat.com> 1.8-2
-- more cleanups to get this package building
+* Fri Dec 19 2008 Adam Stokes <ajs at redhat dot com> - 1.8-4
+- spec cleanup, fixed license, source
+- reworked Makefile to build properly
 
-* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa@redhat.com> 1.8-1
-- fix license tag
-- undid stupid duplicate variable declarations (name, version, release)
+* Thu Oct 23 2008 Adam Stokes <astokes at redhat dot com> - 1.8-1
+- Resolves: bz459845 collect krb5.conf
+- Resolves: bz457880 include output of xm list and xm list --long
+- Resolves: bz457919 add support for openswan and ipsec-tools
+- Resolves: bz456378 capture elilo configuration
+- Resolves: bz445007 s390 support
+- Resolves: bz371251 hangs when running with a xen kernel where xend has not been started
+- Resolves: bz452705 Add /root/anaconda-ks-cfg to sosreport archive
+- Resolves: bz445510 Do not rely on env to execute python
+- Resolves: bz446868 add support for emc devices
+- Resolves: bz453797 fails to generate fdisk -l
+- Resolves: bz433183 does not collect ext3 information
+- Resolves: bz444838 systool is passed deprecated arguments
+- Resolves: bz455096 add %{INSTALLTIME:date} to rpm --qf collection
+- Resolves: bz332211 avoid hazardous filenames
 
 * Wed Nov 21 2007 Navid Sheikhol-Eslami <navid at redhat dot com> - 1.8-0
 - Resolves: bz368261 sosGetCommandOutput() does not block on hung processes
diff --git a/sources b/sources
index 7007522..9953632 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc839be48e8eb5b294e3c64cf0b8e65e  sos-1.8.tar.gz
+04ad06ffb0bc24f96f5704c0c577aaf8  sos-1.8.tar.gz