diff --git a/.SRCINFO b/.SRCINFO
index 00b47be..e0a5332 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,19 @@
 pkgbase = python-pystray
 	pkgdesc = Provides systray integration.
-	pkgver = 0.15.0
+	pkgver = 0.16.0
 	pkgrel = 1
 	url = https://github.com/moses-palmer/pystray
 	arch = any
-	license = GPL
-	makedepends = python
-	makedepends = python2
+	license = GPL3
+	makedepends = python>=3.4
 	makedepends = python-setuptools
-	makedepends = python2-setuptools
-	makedepends = python-sphinx
-	makedepends = python2-sphinx
-	source = https://github.com/moses-palmer/pystray/archive/v0.15.0.tar.gz
-	sha512sums = 889730ef8b7967f60538bf1354fb9864c9136d4c5700c2eab411164f1878938a0c2c2d0946c9df58892f3d3a27832316f5413a462741166b81f49f9d915dfc1f
+	makedepends = python-pip
+	makedepends = python-wheel
+	depends = python-six
+	depends = python-pillow
+	depends = python-xlib>=0.17
+	source = https://github.com/moses-palmer/pystray/archive/v0.16.0.tar.gz
+	sha512sums = 1571a91851cb9ff85cc7497162db687d3cef3ff6c863d1f8ede4ca1275de1f0a1dcf09a313a744f39f5666765c507c0dccf5f75320e5c7bd6dd4074ef2e5b83a
 
 pkgname = python-pystray
-	depends = python-pillow
-	depends = python-six
-	depends = python-xlib
-
-pkgname = python2-pystray
-	depends = python2-pillow
-	depends = python2-six
-	depends = python2-xlib
 
diff --git a/PKGBUILD b/PKGBUILD
index 57a7e0b..53fa9b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,24 @@
 # Maintainer: Julien Nicoulaud <julien DOT nicoulaud AT gmail DOT com>
 
-_pkgname=pystray
-pkgbase="python-${_pkgname}"
-pkgname=("python-${_pkgname}" "python2-${_pkgname}")
-pkgver=0.15.0
+pkgname="python-pystray"
+pkgver=0.16.0
 pkgrel=1
 arch=(any)
-license=('GPL')
+license=('GPL3')
 pkgdesc="Provides systray integration."
 url="https://github.com/moses-palmer/pystray"
-makedepends=('python' 'python2' 'python-setuptools' 'python2-setuptools' 'python-sphinx' 'python2-sphinx')
-source=("https://github.com/moses-palmer/${_pkgname}/archive/v${pkgver}.tar.gz")
-sha512sums=('889730ef8b7967f60538bf1354fb9864c9136d4c5700c2eab411164f1878938a0c2c2d0946c9df58892f3d3a27832316f5413a462741166b81f49f9d915dfc1f')
-
-prepare() {
-  cp -a ${_pkgname}-${pkgver}{,-py2}
-}
+depends=('python-six' 'python-pillow' 'python-xlib>=0.17')
+makedepends=('python>=3.4' 'python-setuptools' 'python-pip' 'python-wheel')
+source=("https://github.com/moses-palmer/pystray/archive/v${pkgver}.tar.gz")
+sha512sums=('1571a91851cb9ff85cc7497162db687d3cef3ff6c863d1f8ede4ca1275de1f0a1dcf09a313a744f39f5666765c507c0dccf5f75320e5c7bd6dd4074ef2e5b83a')
 
 build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "pystray-$pkgver"
   python setup.py build
-
-  cd "${srcdir}/${_pkgname}-${pkgver}-py2"
-  python2 setup.py build
 }
 
 package_python-pystray() {
-  depends=('python-pillow' 'python-six' 'python-xlib')
-
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "pystray-$pkgver"
   python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
-
-package_python2-pystray() {
-  depends=('python2-pillow' 'python2-six' 'python2-xlib')
-
-  cd "${srcdir}/${_pkgname}-${pkgver}-py2"
-  python2 setup.py install --root="$pkgdir" --optimize=1 --skip-build
-}
-