diff --git a/.cvsignore b/.cvsignore
index 52acb2c..f7a7b10 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-buildbot-0.7.7.tar.gz
+buildbot-0.7.11p2.tar.gz
diff --git a/buildbot.spec b/buildbot.spec
index 96acba0..85da6c4 100644
--- a/buildbot.spec
+++ b/buildbot.spec
@@ -1,20 +1,40 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+%global do_tests 1
 
 Name:           buildbot
-Version:        0.7.7
-Release:        2%{?dist}
+Version:        0.7.11p2
+Release:        1%{?dist}
 Summary:        Build/test automation system
 
 Group:          Development/Tools
 License:        GPLv2
 URL:            http://buildbot.net
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:         %{name}-no-shebang.patch
+Source0:        http://pypi.python.org/packages/source/b/%{name}/%{name}-%{version}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
 
+# Needed for tests
+%if %do_tests
+BuildRequires:  python-twisted-core
+BuildRequires:  python-twisted-web
+BuildRequires:  python-twisted-mail
+BuildRequires:  python-twisted-words
+BuildRequires:  bazaar
+BuildRequires:  bzr
+BuildRequires:  cvs
+%ifarch %{ix86} x86_64 ppc alpha
+# darcs ExclusiveArchs
+BuildRequires:  darcs
+%endif
+BuildRequires:  git
+BuildRequires:  mercurial
+BuildRequires:  subversion
+BuildRequires:  tla
+%endif
+
 Requires:       python-twisted-core
 Requires:       python-twisted-web
 Requires:       python-twisted-mail
@@ -22,6 +42,7 @@ Requires:       python-twisted-words
 
 BuildArch:      noarch
 
+
 %description
 The BuildBot is a system to automate the compile/test cycle required by
 most software projects to validate code changes. By automatically
@@ -31,11 +52,16 @@ inconvenienced by the failure.
 
 %prep
 %setup -q
-%patch0 -p1
+
 
 %build
 %{__python} setup.py build
 
+%if %do_tests
+%check
+trial buildbot.test
+%endif
+
 %install
 rm -rf %{buildroot}
 
@@ -56,13 +82,39 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog NEWS README docs
+%doc COPYING CREDITS NEWS README docs/
 %{_bindir}/buildbot
 %{python_sitelib}/*
 %{_datadir}/%{name}
 
 
 %changelog
+* Thu Aug 13 2009 Steve 'Ashcrow' Milner <stevem@gnulinux.net> - 0.7.11p2-1
+- Update for XSS vuln from upstream
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.11p1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jul 17 2009 Gianluca Sforna <giallu gmail com> - 0.7.11p1-1
+- New upstream release
+- Change Source0 URI
+- Make tests optional
+
+* Tue Mar  3 2009 Gianluca Sforna <giallu gmail com> - 0.7.10p1-2
+- New upstream release
+- darcs only avaliable on ix86 platforms 
+
+* Thu Feb 26 2009 Gianluca Sforna <giallu gmail com> - 0.7.10-1
+- New upstream release
+- Drop upstreamed patch
+- Add %%check section and needed BR
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 0.7.7-3
+- Rebuild for Python 2.6
+
 * Thu Apr  3 2008 Gianluca Sforna <giallu gmail com> - 0.7.7-2
 - Fix upgrade path
 
diff --git a/sources b/sources
index 57c2ec0..9e464d8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4647a15a9d9b2db6a5b3493ac78e11d9  buildbot-0.7.7.tar.gz
+eda5b9649d4c079cf835d885965dbafd  buildbot-0.7.11p2.tar.gz