diff --git a/dev-python/pyinsane/Manifest b/dev-python/pyinsane/Manifest
index a961d5e5ae5ac..72e6f969fd9e6 100644
--- a/dev-python/pyinsane/Manifest
+++ b/dev-python/pyinsane/Manifest
@@ -1 +1,2 @@
-DIST pyinsane-1.3.8.tar.gz 28819 SHA256 387ecbc8b8f732e6a250adbc9b9d92a71963eb3fab9435d2dbe40b6113991d62 SHA512 6dc90802b8b53211a621cb1baa68f2741b05b7dd68888bb85898e820b77c6e2810a4355f63219044f2e10edd002a08162117b552ac22bae2ba946a90bbaf9a74 WHIRLPOOL 13a9df7d7f3268de99b325d1bddf83e1cdedc134759eb236b3b9f4b5bb5d74ec82adf3e23a23af03a9e92a90769a4fdf6650026a577de55fa9452c8417ee5d04
+DIST pyinsane-1.4.0.tar.gz 303703 SHA256 e0ba69440f366854c26cb4661bf08fdce95eefa4b99a461c5e8d057909210f55 SHA512 ed56f996174be0ab45cae1380eacb0439b0d0549ea6b2e3c34667a2841822412dc99782d7bba7eaae71b70179f0e3cd5039d38e751ac0598562d68eea1aa8ec8 WHIRLPOOL 48204a0f7b66e8e21b010c3efc8fbcaefd6451bb19a5800e687e3c177b41a149f5b1adc9cdf71e7ce1f16288d2e696061bd028b4e1dce0ae5cf8f739c59de017
+DIST pyinsane-2.0.3.tar.gz 322092 SHA256 9dfd70f6542ee64f84568c6a14285d08d8235e0e3a8de73842a1bd8bc5b39250 SHA512 3df4a1316680500bec03c54ddb0e4735f732437a4356e4d4b56a901d5a87be71447ec66bec349016ce869bc955f1acb99edf7b158ee67764653a797ecc3bb29b WHIRLPOOL c9fba19bc177ccd32dae16784bb8fd4f355226a9c628c9fc2e568c5b9c8b77b64d7de2ef2368ba6e979dea823191a32791015fb37afcb33292b30707400dc427
diff --git a/dev-python/pyinsane/pyinsane-1.3.8.ebuild b/dev-python/pyinsane/pyinsane-1.4.0.ebuild
similarity index 81%
rename from dev-python/pyinsane/pyinsane-1.3.8.ebuild
rename to dev-python/pyinsane/pyinsane-1.4.0.ebuild
index a11f2953a3ec9..168bfb8bb6cf8 100644
--- a/dev-python/pyinsane/pyinsane-1.3.8.ebuild
+++ b/dev-python/pyinsane/pyinsane-1.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/jflesch/pyinsane"
 SRC_URI="https://github.com/jflesch/pyinsane/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
-SLOT="0"
+SLOT="1"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="media-gfx/sane-backends
diff --git a/dev-python/pyinsane/pyinsane-2.0.3.ebuild b/dev-python/pyinsane/pyinsane-2.0.3.ebuild
new file mode 100644
index 0000000000000..36f0bda19d4b1
--- /dev/null
+++ b/dev-python/pyinsane/pyinsane-2.0.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the Sane API and abstration layer"
+HOMEPAGE="https://github.com/jflesch/pyinsane"
+SRC_URI="https://github.com/jflesch/pyinsane/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="media-gfx/sane-backends
+	dev-python/pillow"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+RESTRICT="test" # Tests require at least one scanner with a flatbed and an ADF
+
+python_prepare_all() {
+	sed -e "/'nose>=1.0'/d" -i setup.py || die
+	distutils-r1_python_prepare_all
+}