diff --git a/python-imagesize/PKGBUILD b/python-imagesize/PKGBUILD
new file mode 100644
index 000000000..3d32f91df
--- /dev/null
+++ b/python-imagesize/PKGBUILD
@@ -0,0 +1,38 @@
+pkgbase=python-imagesize
+pkgname=('python3-imagesize' 'python2-imagesize')
+pkgver=0.7.1
+pkgrel=1
+pkgdesc='Getting image size from png/jpeg/jpeg2000/gif file'
+url='https://github.com/shibukawa/imagesize_py'
+arch=('any')
+license=('MIT')
+
+makedepends=('python3-setuptools' 'python2-setuptools')
+
+source=("https://pypi.python.org/packages/53/72/6c6f1e787d9cab2cc733cf042f125abec07209a58308831c9f292504e826/imagesize-$pkgver.tar.gz")
+
+md5sums=('976148283286a6ba5f69b0f81aef8052')
+
+build() {
+  cp -r imagesize-$pkgver imagesize-$pkgver-py2
+
+  cd "$srcdir"/imagesize-$pkgver
+  python3 setup.py build
+
+  cd "$srcdir"/imagesize-$pkgver-py2
+  python2 setup.py build
+}
+
+package_python3-imagesize() {
+  depends=('python3')
+
+  cd imagesize-$pkgver
+  python3 setup.py install --root="$pkgdir" --optimize=1
+}
+
+package_python2-imagesize() {
+  depends=('python2')
+
+  cd imagesize-$pkgver-py2
+  python2 setup.py install --root="$pkgdir" --optimize=1
+}
diff --git a/python-pytest-runner/PKGBUILD b/python-pytest-runner/PKGBUILD
deleted file mode 100644
index 10e3606bf..000000000
--- a/python-pytest-runner/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# Arch Contributor: Felix Yan <felixonmars@archlinux.org>
-
-pkgbase=python-pytest-runner
-pkgname=('python3-pytest-runner' 'python2-pytest-runner')
-pkgver=2.12.1
-pkgrel=1
-pkgdesc="Invoke py.test as distutils command with dependency resolution"
-arch=('any')
-license=('MIT')
-url="https://github.com/pytest-dev/pytest-runner"
-makedepends=('python3-pytest' 'python2-pytest' 'git')
-source=("git+https://github.com/pytest-dev/pytest-runner.git#tag=$pkgver")
-sha512sums=('SKIP')
-
-prepare() {
-  cp -a pytest-runner{,-py2}
-}
-
-build() {
-  cd "$srcdir"/pytest-runner
-  python3 setup.py build
-
-  cd "$srcdir"/pytest-runner-py2
-  python2 setup.py build
-}
-
-check() {
-  cd "$srcdir"/pytest-runner
-  python3 setup.py egg_info
-  PYTHONPATH="$PWD" py.test
-
-  cd "$srcdir"/pytest-runner-py2
-  python2 setup.py egg_info
-  PYTHONPATH="$PWD" py.test2
-}
-
-package_python3-pytest-runner() {
-  depends=('python3-pytest')
-
-  cd pytest-runner
-  python3 setup.py install --root="$pkgdir" --optimize=1
-  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-
-package_python2-pytest-runner() {
-  depends=('python2-pytest')
-
-  cd pytest-runner-py2
-  python2 setup.py install --root="$pkgdir" --optimize=1
-  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/python-sphinx/PKGBUILD b/python-sphinx/PKGBUILD
index ee480e9f5..070be3454 100644
--- a/python-sphinx/PKGBUILD
+++ b/python-sphinx/PKGBUILD
@@ -10,7 +10,7 @@
 pkgbase=python-sphinx
 pkgname=('python3-sphinx' 'python2-sphinx')
 pkgver=1.6.5
-pkgrel=1
+pkgrel=2
 arch=('any')
 url='http://sphinx.pocoo.org/'
 license=('GPL')
@@ -20,11 +20,20 @@ makedepends=(
   'python3-jinja'
   'python3-pygments'
   'python3-six'
+  'python3-imagesize'
+  'python3-sphinxcontrib-websupport'
+  'python3-sqlalchemy'
+  'python3-whoosh'
   'python2-setuptools'
   'python2-docutils'
   'python2-jinja'
   'python2-pygments'
   'python2-six'
+  'python2-imagesize'
+  'python2-sphinxcontrib-websupport'
+  'python2-sqlalchemy'
+  'python2-whoosh'
+  'python2-typing'
 )
 checkdepends=(
   'python3-nose' 'python2-nose'
@@ -92,6 +101,11 @@ package_python3-sphinx() {
     'python3-babel'
     'python3-snowballstemmer'
     'python3-six'
+    'python3-imagesize'
+    'python3-requests'
+    'python3-sphinxcontrib-websupport'
+    'python3-sqlalchemy'
+    'python3-whoosh'
   )
   optdepends=('texlive-latexextra: for generation of PDF documentation')
 
@@ -110,6 +124,12 @@ package_python2-sphinx() {
     'python2-babel'
     'python2-snowballstemmer'
     'python2-six'
+    'python2-imagesize'
+    'python2-requests'
+    'python2-sphinxcontrib-websupport'
+    'python2-sqlalchemy'
+    'python2-whoosh'
+    'python2-typing'
   )
   optdepends=('texlive-latexextra: for generation of PDF documentation')
 
diff --git a/python-sphinxcontrib-websupport/PKGBUILD b/python-sphinxcontrib-websupport/PKGBUILD
new file mode 100644
index 000000000..8c52b5d60
--- /dev/null
+++ b/python-sphinxcontrib-websupport/PKGBUILD
@@ -0,0 +1,34 @@
+pkgbase=python-sphinxcontrib-websupport
+pkgname=(python3-sphinxcontrib-websupport python2-sphinxcontrib-websupport)
+pkgver=1.0.1
+pkgrel=1
+pkgdesc="Sphinx API for Web Apps"
+arch=('any')
+url="http://www.sphinx-doc.org/"
+license=('BSD')
+makedepends=('python3' 'python3-setuptools' 'python2' 'python2-setuptools')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/sphinx-doc/sphinxcontrib-websupport/archive/$pkgver.tar.gz")
+sha512sums=('06ee11f2b2212333a6d01201824879e5b5931e85db5f20badd62bc28ddba88ce7c0b3f0b7ce4f4e3d43cb8f66173b31d10e1264f0acc48bb2db7385f50c68313')
+
+prepare() {
+  cp -a sphinxcontrib-websupport-$pkgver{,-py2}
+}
+
+build() {
+  cd "$srcdir"/sphinxcontrib-websupport-$pkgver
+  python3 setup.py build
+
+  cd "$srcdir"/sphinxcontrib-websupport-$pkgver-py2
+  python2 setup.py build
+}
+
+package_python3-sphinxcontrib-websupport() {
+  cd "$srcdir"/sphinxcontrib-websupport-$pkgver
+  python3 setup.py install --root="$pkgdir" --optimize=1
+}
+
+package_python2-sphinxcontrib-websupport() {
+  cd "$srcdir"/sphinxcontrib-websupport-$pkgver-py2
+  python2 setup.py install --root="$pkgdir" --optimize=1
+}
+
diff --git a/python-whoosh/PKGBUILD b/python-whoosh/PKGBUILD
new file mode 100644
index 000000000..efd86b6f5
--- /dev/null
+++ b/python-whoosh/PKGBUILD
@@ -0,0 +1,49 @@
+pkgbase=python-whoosh
+pkgname=(python3-whoosh python2-whoosh)
+pkgver=2.7.4
+pkgrel=1
+pkgdesc="Fast, pure-Python full text indexing, search, and spell checking library"
+arch=('any')
+url="http://bitbucket.org/mchaput/whoosh/wiki/Home"
+license=("BSD")
+makedepends=('python3-setuptools' 'python2-setuptools' 'mercurial')
+checkdepends=('python3-pytest-runner' 'python2-pytest-runner')
+source=("hg+https://bitbucket.org/mchaput/whoosh#tag=$pkgver")
+md5sums=('SKIP')
+
+prepare() {
+  cp -a whoosh{,-py2}
+}
+
+build() {
+  cd "$srcdir"/whoosh
+  python3 setup.py build
+
+  cd "$srcdir"/whoosh-py2
+  python2 setup.py build
+}
+
+# returns this error: https://bitbucket.org/pytest-dev/pytest/issues/567/
+#check() {
+#  cd "$srcdir"/whoosh
+#  python3 setup.py pytest
+#
+#  cd "$srcdir"/whoosh-py2
+#  python2 setup.py pytest || warning "Tests failed"
+#}
+
+package_python3-whoosh() {
+  depends=('python3')
+
+  cd whoosh
+  python3 setup.py install -O1 --root="$pkgdir"
+  install -D -m644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt
+}
+
+package_python2-whoosh() {
+  depends=('python2')
+
+  cd whoosh-py2
+  python2 setup.py install -O1 --root="$pkgdir"
+  install -D -m644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt
+}
diff --git a/python2-typing/PKGBUILD b/python2-typing/PKGBUILD
new file mode 100644
index 000000000..ad865d6f0
--- /dev/null
+++ b/python2-typing/PKGBUILD
@@ -0,0 +1,24 @@
+
+pkgname=python2-typing
+pkgver=3.6.1
+pkgrel=1
+pkgdesc="Backport of the standard library typing module to Python versions older than 3.6"
+url="https://pypi.python.org/pypi/typing"
+arch=('any')
+license=('FSF')
+makedepends=('python2'
+             'python2-setuptools')
+source=("python2-typing-$pkgver.tar.gz::https://pypi.io/packages/source/t/typing/typing-$pkgver.tar.gz")
+md5sums=('3fec97415bae6f742fb3c3013dedeb89')
+
+build() {
+	cd typing-$pkgver
+	python2 setup.py build
+}
+
+package() {
+	depends=('python2')
+
+	cd typing-$pkgver
+	python2 setup.py install --root "$pkgdir" --optimize=1 --skip-build
+}