diff --git a/dev-python/configobj/configobj-5.0.6.ebuild b/dev-python/configobj/configobj-5.0.6.ebuild
index 7b15b625f3909..c58c7ad3f1cc5 100644
--- a/dev-python/configobj/configobj-5.0.6.ebuild
+++ b/dev-python/configobj/configobj-5.0.6.ebuild
@@ -3,7 +3,8 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
 
 inherit distutils-r1
 
@@ -19,8 +20,10 @@ RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
 python_prepare_all() {
 	# Not to install un-needed _version.py
-	sed -e "/^MODULES =/s/, '_version'//" -i setup.py
-	sed -e "s/^from _version import __version__$/__version__ = '${PV}'/" -i configobj.py
+	sed -e "/^MODULES =/s/, '_version'//" -i setup.py || die
+	sed \
+		-e "s/^from _version import __version__$/__version__ = '${PV}'/" \
+		-i configobj.py || die
 
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/configobj/metadata.xml b/dev-python/configobj/metadata.xml
index 3b31e82a3e9e7..a1a4091557894 100644
--- a/dev-python/configobj/metadata.xml
+++ b/dev-python/configobj/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>