diff --git a/python-sipclients/PKGBUILD b/python-sipclients/PKGBUILD
deleted file mode 100644
index 529a72e8a..000000000
--- a/python-sipclients/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Apps Packages for Chakra, part of chakra-project.org
-#
-# Maintainer: Daniele Cocca <jmc@chakra-project.org>
-#
-
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
-
-pkgname=python-sipclients
-pkgver=20120107
-pkgrel=1
-pkgdesc="Clients used to test the SIP SIMPLE Client library."
-arch=('any')
-url="http://sipsimpleclient.com/"
-license=('LGPL')
-depends=('python-sipsimple')
-makedepends=('darcs')
-
-_darcstrunk="http://devel.ag-projects.com/repositories"
-_darcsmod="sipclients"
-
-build() {
-  msg "Starting Darcs pull..."
-  cd "${srcdir}"
-  if [ -d "${_darcsmod}/_darcs" ]; then
-    (cd "${_darcsmod}" && darcs pull -a)
-  else
-    darcs get "${_darcstrunk}/${_darcsmod}" "${_darcsmod}"
-  fi
-  msg "Darcs pull done (or server timeout)."
-}
-
-package() {
-  cd "${srcdir}/${_darcsmod}"
-  python2 setup.py install --prefix=/usr --root="${pkgdir}" || return 1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/python-six/PKGBUILD b/python-six/PKGBUILD
new file mode 100644
index 000000000..4d18b7b4e
--- /dev/null
+++ b/python-six/PKGBUILD
@@ -0,0 +1,43 @@
+# Maintainer: Manuel 'UtG' <utg[dot]chakra.linux[at]gmail[dot]com>
+# Contributor: Allan McRae <allan@archlinux.org>
+
+pkgbase=python-six
+pkgname=('python2-six' 'python3-six')
+pkgver=1.6.1
+pkgrel=2
+pkgdesc="Python 2 and 3 compatibility utilities"
+arch=('x86_64')
+url="http://pypi.python.org/pypi/six/"
+license=('MIT')
+makedepends=('python2' 'python3')
+source=(http://pypi.python.org/packages/source/s/six/six-$pkgver.tar.gz)
+md5sums=('07d606ac08595d795bf926cc9985674f')
+
+build() {
+  cd $srcdir
+  cp -r six-$pkgver six2-$pkgver
+}
+
+check() {
+  cd $srcdir/six-$pkgver 
+  python3 setup.py check
+
+  cd $srcdir/six2-$pkgver 
+  python2 setup.py check
+}
+
+package_python3-six() {
+  depends=('python3')
+
+  cd $srcdir/six-$pkgver 
+  python3 setup.py install --root "${pkgdir}" --optimize=1
+  install -Dm644 "${srcdir}/six-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_python2-six() {
+  depends=('python2')
+
+  cd $srcdir/six2-$pkgver 
+  python2 setup.py install --root "${pkgdir}" --optimize=1
+  install -Dm644 "${srcdir}/six-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/python2-six/PKGBUILD b/python2-six/PKGBUILD
deleted file mode 100644
index b6bbe25cf..000000000
--- a/python2-six/PKGBUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-# Maintainer: Neophytos Kolokotronis <tetris4@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-
-pkgname=python2-six
-pkgver=1.6.1
-pkgrel=1
-pkgdesc="Python 2 and 3 compatibility utilities"
-arch=('x86_64')
-url="http://pypi.python.org/pypi/six/"
-license=('custom')
-depends=('python2')
-source=(http://pypi.python.org/packages/source/s/six/six-$pkgver.tar.gz)
-md5sums=('07d606ac08595d795bf926cc9985674f')
-
-package() {
-  cd "$srcdir/six-$pkgver"
-  python2 setup.py install --root "${pkgdir}" --optimize=1
-}