diff --git a/python-monotonic/PKGBUILD b/python-monotonic/PKGBUILD
new file mode 100644
index 000000000..6fbc3bff7
--- /dev/null
+++ b/python-monotonic/PKGBUILD
@@ -0,0 +1,31 @@
+# Contributions from Arch
+# Maintainer: Lukas Fleischer <lfleischer@archlinux.org>
+# Contributor: Kevin Houdebert <kevin@qwazerty.eu>
+# Contributor: Erhan SAHIN <erhan@ssahin.net>
+
+_pkgname=monotonic
+pkgname=('python3-monotonic' 'python2-monotonic')
+pkgver=1.4
+pkgrel=1
+url="https://pypi.python.org/pypi/monotonic"
+license=('Apache')
+arch=('any')
+makedepends=('python3-setuptools' 'python2-setuptools')
+source=("$_pkgname-$pkgver.tar.gz::https://github.com/atdt/monotonic/archive/$pkgver.tar.gz")
+sha512sums=('2ac02b027a41f4635b62508a9a435ffd124d0f0708a93558a6702dc997837e602790ebf6af256434faa15989e9c4ad7d8a27be9fdcf04bb22b451991a7e8cc46')
+
+package_python3-monotonic() {
+  pkgdesc="An implementation of time.monotonic() for Python 3."
+  depends=('python3')
+
+  cd "$srcdir/$_pkgname-$pkgver"
+  python3 setup.py install --root="$pkgdir" --optimize=1
+}
+
+package_python2-monotonic() {
+  pkgdesc="An implementation of time.monotonic() for Python 2."
+  depends=('python2')
+
+  cd "$srcdir/$_pkgname-$pkgver"
+  python2 setup.py install --root="$pkgdir" --optimize=1
+}
diff --git a/python2-monotonic/PKGBUILD b/python2-monotonic/PKGBUILD
deleted file mode 100644
index 6235e5d9e..000000000
--- a/python2-monotonic/PKGBUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-
-pkgname=python2-monotonic
-pkgver=1.0
-pkgrel=1
-pkgdesc="An implementation of time.monotonic() for Python 2 & < 3.3"
-arch=('any')
-url='http://pypi.python.org/pypi/monotonic'
-license=('Apache')
-depends=('python2')
-makedepends=('python2-setuptools')
-source=("https://pypi.python.org/packages/source/m/monotonic/monotonic-${pkgver}.tar.gz")
-sha256sums=('47d7d045b3f2a08bffe683d761ef7f9131a2598db1cec7532a06720656cf719d')
-
-package() {
-  cd monotonic-${pkgver}
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-}