diff --git a/sos.spec b/sos.spec
index dcd4143..cc4c81c 100644
--- a/sos.spec
+++ b/sos.spec
@@ -5,8 +5,8 @@
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
 Version: 1.8
-Release: 1%{?dist}
-Group: Application/Tools
+Release: 2%{?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
@@ -20,7 +20,7 @@ Url: https://hosted.fedoraproject.org/projects/sos
 BuildRequires: python-devel
 Requires: libxml2-python
 Provides: sysreport = 1.4.3-13
-Obsoletes: sysreport
+Obsoletes: sysreport < 1.4.3-13
 
 %description
 Sos is a set of tools that gathers information about system
@@ -32,32 +32,38 @@ support technicians and developers.
 %setup -q
 
 %build
-python setup.py build
+%{__python} setup.py build
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-install -D -m644 %{SOURCE1} ${RPM_BUILD_ROOT}/usr/share/sos/rhsupport.pub
-python setup.py install --optimize 1 --root=$RPM_BUILD_ROOT
-ln -s /usr/sbin/sosreport $RPM_BUILD_ROOT/usr/sbin/sysreport
+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
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_sbindir}/sosreport
-/usr/share/sos/rhsupport.pub
-/usr/bin/rh-upload-core
-/usr/sbin/sysreport
-/usr/sbin/sysreport.legacy
-/usr/share/sysreport
+%{_datadir}/sos/
+%{_bindir}/rh-upload-core
+%{_sbindir}/sysreport
+%{_sbindir}/sysreport.legacy
+%{_datadir}/sysreport
 %{python_sitelib}/sos/
+%{python_sitelib}/%{name}-0.0.0-py*.egg-info
 %{_mandir}/man1/sosreport.1*
-%{_localedir}/*/LC_MESSAGES/sos.mo
 %doc README README.rh-upload-core TODO LICENSE ChangeLog
-%config /etc/sos.conf
+%config(noreplace) %{_sysconfdir}/sos.conf
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa@redhat.com> 1.8-2
+- more cleanups to get this package building
+
 * Thu Sep  4 2008 Tom "spot" Callaway <tcallawa@redhat.com> 1.8-1
 - fix license tag
 - undid stupid duplicate variable declarations (name, version, release)