diff --git a/.gitignore b/.gitignore
index b83307d..d7e5721 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /txaio-1.0.2.tar.gz
 /txaio-1.0.3.tar.gz
 /txaio-2.0.2.tar.gz
+/txaio-2.0.4.tar.gz
diff --git a/python-txaio-2.0.2-sphinx-config_find-theme.patch b/python-txaio-2.0.2-sphinx-config_find-theme.patch
deleted file mode 100644
index 69c2716..0000000
--- a/python-txaio-2.0.2-sphinx-config_find-theme.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- doc/conf.py.orig	2015-08-08 15:43:06.296973317 +0200
-+++ doc/conf.py	2015-08-08 15:43:35.857320995 +0200
-@@ -16,6 +16,7 @@
- import sys
- import os
- import shlex
-+import alabaster
- 
- # If extensions (or modules to document with autodoc) are in another directory,
- # add these directories to sys.path here. If the directory is relative to the
-@@ -127,7 +128,7 @@
- #html_theme_options = {}
- 
- # Add any paths that contain custom themes here, relative to this directory.
--#html_theme_path = []
-+html_theme_path = [alabaster.get_path()]
- 
- # The name for this set of Sphinx documents.  If None, it defaults to
- # "<project> v<release> documentation".
diff --git a/python-txaio-2.0.4-sphinx-config_find-theme.patch b/python-txaio-2.0.4-sphinx-config_find-theme.patch
new file mode 100644
index 0000000..aa31886
--- /dev/null
+++ b/python-txaio-2.0.4-sphinx-config_find-theme.patch
@@ -0,0 +1,19 @@
+--- docs/conf.py	2015-09-27 08:54:46.000000000 +0200
++++ docs/conf.py	2015-10-17 18:43:07.013014490 +0200
+@@ -17,6 +17,7 @@
+ import os
+ import shlex
+ import time
++import alabaster
+ 
+ try:
+     import sphinx_rtd_theme
+@@ -174,7 +175,7 @@
+ #html_theme_options = {}
+ 
+ # Add any paths that contain custom themes here, relative to this directory.
+-#html_theme_path = []
++html_theme_path = [alabaster.get_path()]
+ 
+ # The name for this set of Sphinx documents.  If None, it defaults to
+ # "<project> v<release> documentation".
diff --git a/python-txaio-2.0.4-tests.patch b/python-txaio-2.0.4-tests.patch
new file mode 100644
index 0000000..b495645
--- /dev/null
+++ b/python-txaio-2.0.4-tests.patch
@@ -0,0 +1,10 @@
+--- test/test_packaging.py	2015-10-17 19:09:01.342981497 +0200
++++ test/test_packaging.py	2015-10-17 19:09:37.874402253 +0200
+@@ -34,6 +34,7 @@
+ import txaio
+
+
++@pytest.mark.skipif(True, reason='Not needed for RPM build')
+ def test_sdist():
+     if not hasattr(subprocess, 'check_output'):
+         pytest.skip()
diff --git a/python-txaio.spec b/python-txaio.spec
index c8da596..63fb65d 100644
--- a/python-txaio.spec
+++ b/python-txaio.spec
@@ -1,7 +1,7 @@
 %global pypi_name txaio
 
 Name:           python-%{pypi_name}
-Version:        2.0.2
+Version:        2.0.4
 Release:        1%{?dist}
 Summary:        Compatibility API between asyncio/Twisted/Trollius
 
@@ -9,6 +9,7 @@ License:        MIT
 URL:            https://pypi.python.org/pypi/%{pypi_name}
 Source0:        https://pypi.python.org/packages/source/t/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
 Patch0:         python-txaio-%{version}-sphinx-config_find-theme.patch
+Patch1:         python-txaio-%{version}-tests.patch
 
 BuildArch:      noarch
 BuildRequires:  python2-devel
@@ -69,13 +70,14 @@ asyncio. Documentation in html format.
 %prep
 %setup -qn %{pypi_name}-%{version}
 %patch0
+%patch1
 
 # Remove upstream's egg-info
 rm -rf %{pypi_name}.egg-info
 
 # README is just a symlink to index.rst. Using this file as README
 rm README.rst
-cp -a doc/index.rst README.rst
+cp -a docs/index.rst README.rst
 
 
 %build
@@ -83,7 +85,7 @@ cp -a doc/index.rst README.rst
 %py3_build
 
 # Build documentation
-cd doc && make html
+cd docs && make html
 
 # Remove buildinfo
 rm -rf _build/html/.buildinfo
@@ -119,10 +121,13 @@ PYTHONPATH=$PYTHONPATH:. coverage2 run -p --source=txaio /usr/bin/py.test-%{pyth
 
 %files doc
 %license LICENSE
-%doc doc/_build/html
+%doc docs/_build/html
 
 
 %changelog
+* Sat Oct 17 2015 Julien Enselme <jujens@jujens.eu> - 2.0.4-1
+- Update 2.0.4
+
 * Mon Sep 28 2015 Julien Enselme <jujens@jujens.eu> - 2.0.2-1
 - Update to 2.0.2
 
diff --git a/sources b/sources
index b42276d..52beddc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-11cb3ee8b6b3f7c02fc96a2acb15bbc2  txaio-2.0.2.tar.gz
+8049f08ae608b98f4d9c60f0c9ddf621  txaio-2.0.4.tar.gz