diff --git a/dev-python/martINI/ChangeLog b/dev-python/martINI/ChangeLog
index 47cc3606..981b1155 100644
--- a/dev-python/martINI/ChangeLog
+++ b/dev-python/martINI/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for dev-python/martINI
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Jun 2017; Mario Fetka <mario@gentoo.org> martINI-0.4.ebuild:
+  switch to distutils-r1
+
 *martINI-0.4 (20 Feb 2013)
 
   20 Feb 2013; Mario Fetka <mario.fetka@gmail.com> +martINI-0.4.ebuild,
diff --git a/dev-python/martINI/Manifest b/dev-python/martINI/Manifest
index 805412a7..5f9d6899 100644
--- a/dev-python/martINI/Manifest
+++ b/dev-python/martINI/Manifest
@@ -1,4 +1,4 @@
 DIST martINI-0.4.tar.gz 15721 SHA256 070d926e84e45fcf3522af18f355d4ffdb05a50a4bec50ea58e691d572d81477 SHA512 6a8f972f6235f9e84222b1dd8f13185b25dcde64fd72f72410bbbcf2252bdd9749e627524554966265684d1bef2ac9bc4d22b04f9ef56d07e330d37e43a14862 WHIRLPOOL 0f5313752eec4f81d2ac21539601d1f6bf36c489d0ba39f75d5fa1e3efaf6e5d74417c86f22418c7a7128577e037401da48f80f0d83fef16e75c803060d4ebcf
-EBUILD martINI-0.4.ebuild 652 SHA256 723cdc2c68243f4aa4455b3bb0b302d44d73755b0c39546cff95619673550cfe SHA512 6f52f6ae85302fcbd040f49f87cbab9587ad09edd4fc0b29ba6a788145d422a007cf724a051cc09f01431f23a5844fa6309731cf9f335444d06dd7fc29d38fbb WHIRLPOOL e853b5e17739ca461b3e103e61a7492029cb2588edb1d4e3543e5122c649ef0fe1cad96983ff696ab369e248fade7b29c061d2025408f84b9de8473e6eb70ec5
-MISC ChangeLog 254 SHA256 f85393b28330ac97df26f7bd180ebf18fb23b198f89ed0d92da8a160a1e5e392 SHA512 173101aa95168e964b2d3fcaefda550ae7fbf3a4b2cec7df6f4caf7398dbd4ce48413aafaa2fbc604dc29226bbd29ae4247e316ecb949d914e88d45713470686 WHIRLPOOL 8178fe10647d57f31b285e210a022eb783eb4889c446f9eb432dce87ecea3bd0fa4ac6ede9f7ad67feda1f60f3e0e5f79d863c62feccf6d1e30f7cb37d89a4f8
+EBUILD martINI-0.4.ebuild 631 SHA256 f7d4c00234d9924f902ff02358cd028a22f08d807fd9718154bae1eae5aa4cc7 SHA512 179f08cbcc83d6b1d5516e7fe3f78a2db6117d20db42fde236f31826f5236be6b6224c90053fea5e67db880e1dbf96a74aa9c0c495af5bcd845c7a7de34738b9 WHIRLPOOL 25aeec94299a9ebc9bcbbe2d4d55304c7f9dbd4cee53f3ab347690cb891125d9c2437827adf39ea7a0e33b9d149cfffd22fe08b1a6fbec9cdd0d22d9dae03edc
+MISC ChangeLog 346 SHA256 2695d3337117244ab40718df4964bc626fd0506406fba3644430410897423f4d SHA512 922082ce924c963d894f017953b1fbac1b43fc37cb4d9e05069aeb0615f7c4751938c32957a62dc0eec2d7f0c07fbb76fcfd353fef4d3b371f93ea2b3ad5133f WHIRLPOOL 17611038cae7da32d64403d3b178c1993cc1305d6b5968aab93c725a403649a13c8134f3cdb5020b9abd1630484f1809110428f4ff0b8af0be9cb26d9111cf4c
 MISC metadata.xml 205 SHA256 9fdfc9c91107d94feb8416adc2cec7734fa27084bff83ea859938b3216e028bc SHA512 ef3a39d2cd131cd29451ec2d009484e89b60e8cbeed5fc0f5f899cebb0c5f9867682ce603982e4de32004493944c6ff99a4c797e7ef2441d6049e5a616143a8b WHIRLPOOL 779e2cb116b19389f70acc6d49694358619116f9849f3b8e46f00df4e39b4476424b20990b9dabb4ba16605d1894d6b820eaeb930401d825265bfdca27f6fb96
diff --git a/dev-python/martINI/martINI-0.4.ebuild b/dev-python/martINI/martINI-0.4.ebuild
index 771dc170..bcb5aacc 100644
--- a/dev-python/martINI/martINI-0.4.ebuild
+++ b/dev-python/martINI/martINI-0.4.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-python/pudb/pudb-0.92.14.ebuild,v 1.1 2009/12/21 02:56:30 arfrever Exp $
 
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
-inherit distutils
+inherit distutils-r1
 
 DESCRIPTION="edit .ini files from the command line"
 HOMEPAGE="http://k0s.org/portfolio/software.html#martini"
@@ -14,7 +13,7 @@ SRC_URI="mirror://pypi/m/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-interix ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-python/genshi