diff --git a/pycairo.spec b/pycairo.spec
index 46a31ca..f30761f 100644
--- a/pycairo.spec
+++ b/pycairo.spec
@@ -2,7 +2,7 @@
 
 Name: pycairo
 Version: 1.8.10
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: MPLv1.1 or LGPLv2
 Group: Development/Languages
 Summary: Python bindings for the cairo library
@@ -10,8 +10,12 @@ URL: http://cairographics.org/pycairo
 Source: http://cairographics.org/releases/py2cairo-%{version}.tar.gz
 
 BuildRequires: cairo-devel
+BuildRequires: libxcb-devel
 BuildRequires: pkgconfig
+BuildRequires: pytest
 BuildRequires: python-devel
+BuildRequires: python-xpyb-devel
+Requires: python-xpyb
 
 %description
 Python bindings for the cairo library.
@@ -32,25 +36,32 @@ libraries so that they interoperate with pycairo.
 %setup -q
 
 %build
-%configure
+%configure --enable-xcb --enable-xpyb
 make %{?_smp_mflags}
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
 find $RPM_BUILD_ROOT -name '*.la' | xargs rm -f
 
+%check
+cd test
+PYTHONPATH=$RPM_BUILD_ROOT%{python_sitearch} py.test
+
 %files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING* INSTALL NEWS README
+%doc AUTHORS COPYING* NEWS README
 %doc examples doc/faq.rst doc/overview.rst doc/README
 %{python_sitearch}/cairo/
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/pycairo/
 %{_libdir}/pkgconfig/pycairo.pc
 
 %changelog
+* Thu Feb 27 2014 Peter Robinson <pbrobinson@fedoraproject.org> 1.8.10-8
+- Enable xcb and xpyb (RHBZ 1045725, 1005447)
+- Spec cleanups
+- Run check
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.10-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild