diff --git a/.cvsignore b/.cvsignore
index af019bd..398d4e7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-Genshi-0.4.4.tar.bz2
+Genshi-0.5.tar.bz2
diff --git a/python-genshi.spec b/python-genshi.spec
index 1eb2cb8..719e979 100644
--- a/python-genshi.spec
+++ b/python-genshi.spec
@@ -1,19 +1,20 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-genshi
-Version:        0.4.4
+Version:        0.5
 Release:        1%{?dist}
 Summary:        Toolkit for stream-based generation of output for the web
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://genshi.edgewall.org/
+
 Source0:        http://ftp.edgewall.com/pub/genshi/Genshi-%{version}.tar.bz2
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildArch:      noarch
 BuildRequires:  python-devel
-BuildRequires:  python-setuptools
+BuildRequires:  python-setuptools-devel
 
 %description
 Genshi is a Python library that provides an integrated set of
@@ -31,16 +32,28 @@ find examples -type f | xargs chmod a-x
 %install
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
- 
+
+%check
+%{__python} setup.py test
+
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING doc examples README.txt UPGRADE.txt
-%{python_sitelib}/*
+%doc ChangeLog COPYING doc examples README.txt 
+%{python_sitearch}/*
 
 %changelog
+* Mon Jun  9 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 0.5-1
+- Update to released version of Genshi.
+
+* Thu Apr 24 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 0.5-0.1.svn847
+- Update to snapshot of 0.5
+
+* Tue Aug 28 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 0.4.4-2
+- BR python-setuptools-devel
+
 * Mon Aug 27 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 0.4.4-1
 - Update to 0.4.4
 
diff --git a/sources b/sources
index 7d3e000..4cfcfe0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e9d8a1e6b0c3692e43d4bedb9df8a266  Genshi-0.4.4.tar.bz2
+d8514ce763330d450bfa55869b375e5d  Genshi-0.5.tar.bz2