diff --git a/python-toposort/PKGBUILD b/python-toposort/PKGBUILD
new file mode 100644
index 000000000..a28918a70
--- /dev/null
+++ b/python-toposort/PKGBUILD
@@ -0,0 +1,49 @@
+pkgbase=python-toposort
+pkgname=('python3-toposort' 'python2-toposort')
+pkgver=1.5
+pkgrel=1
+pkgdesc='Implements a topological sort algorithm'
+arch=('any')
+license=('Apache')
+url='https://bitbucket.org/ericvsmith/toposort'
+makedepends=('python3-setuptools' 'python2-setuptools')
+checkdepends=('python3-pytest' 'python2-pytest')
+source=("$pkgbase-$pkgver.tar.gz::https://bitbucket.org/ericvsmith/toposort/get/$pkgver.tar.bz2")
+sha512sums=('f79ee4a04b157db164e484be054bed6d310023722cd13469454022eb96ccd3ff5bf6dc570384d3ca790c819b67afa4a96c716da2b99c458d8ddfe2e56e5222a0')
+
+prepare() {
+  mv ericvsmith-toposort-* toposort-$pkgver
+  cp -a toposort-$pkgver{,-py2}
+}
+
+build() {
+  cd "$srcdir"/toposort-$pkgver
+  python3 setup.py build
+
+  cd "$srcdir"/toposort-$pkgver-py2
+  python2 setup.py build
+}
+
+check() {
+  cd "$srcdir"/toposort-$pkgver
+  python3 setup.py test
+
+  cd "$srcdir"/toposort-$pkgver-py2
+  python2 setup.py test
+}
+
+package_python3-toposort() {
+  depends=('python3')
+
+  cd toposort-$pkgver
+  python3 setup.py install --root="$pkgdir" --optimize=1
+}
+
+package_python2-toposort() {
+  depends=('python2')
+
+  cd toposort-$pkgver-py2
+  python2 setup.py install --root="$pkgdir" --optimize=1
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/python3-toposort/PKGBUILD b/python3-toposort/PKGBUILD
deleted file mode 100644
index c567a2003..000000000
--- a/python3-toposort/PKGBUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=python3-toposort
-_pkgname=toposort
-pkgver=1.4
-pkgrel=1
-pkgdesc='Implements a topological sort algorithm.'
-arch=('any')
-url='https://bitbucket.org/ericvsmith/toposort'
-license=('apache')
-depends=('python3')
-makedepends=('python3-setuptools')
-source=("https://pypi.python.org/packages/source/t/${_pkgname}/${_pkgname}-${pkgver}.tar.gz")
-sha256sums=('c190b9d9a9e53ae2835f4d524130147af601fbd63677d19381c65067a80fa903')
-
-package() {
-  cd "${_pkgname}-${pkgver}"
-  python3 setup.py install --root="${pkgdir}/"
-}
diff --git a/python3.order b/python3.order
index bbe9ea305..4f76fd677 100644
--- a/python3.order
+++ b/python3.order
@@ -93,3 +93,4 @@ python3-inflection
 python-termcolor
 python-utils
 python-progressbar
+python-toposort