diff --git a/media-gfx/icoutils/icoutils-0.31.0.ebuild b/media-gfx/icoutils/icoutils-0.31.0.ebuild
index db7c409d2c2..58ef5989a77 100644
--- a/media-gfx/icoutils/icoutils-0.31.0.ebuild
+++ b/media-gfx/icoutils/icoutils-0.31.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -29,7 +29,7 @@ src_prepare() {
 }
 
 src_configure() {
-	[[ ${CHOST} != *-linux-gnu* ]] && use nls && append-libs -lintl
+	use !elibc_glibc && use !elibc_musl && use nls && append-libs -lintl
 	econf $(use_enable nls)
 }
 
diff --git a/media-gfx/icoutils/icoutils-0.31.1.ebuild b/media-gfx/icoutils/icoutils-0.31.1.ebuild
index 772d516133f..a896490fc9f 100644
--- a/media-gfx/icoutils/icoutils-0.31.1.ebuild
+++ b/media-gfx/icoutils/icoutils-0.31.1.ebuild
@@ -29,7 +29,7 @@ src_prepare() {
 }
 
 src_configure() {
-	[[ ${CHOST} != *-linux-gnu* ]] && use nls && append-libs -lintl
+	use !elibc_glibc && use !elibc_musl && use nls && append-libs -lintl
 	econf $(use_enable nls)
 }
 
diff --git a/media-gfx/icoutils/icoutils-0.31.3.ebuild b/media-gfx/icoutils/icoutils-0.31.3.ebuild
index 4241e878763..24c8487b7a1 100644
--- a/media-gfx/icoutils/icoutils-0.31.3.ebuild
+++ b/media-gfx/icoutils/icoutils-0.31.3.ebuild
@@ -39,7 +39,7 @@ src_prepare() {
 }
 
 src_configure() {
-	[[ ${CHOST} != *-linux-gnu* ]] && use nls && append-libs -lintl
+	use !elibc_glibc && use !elibc_musl && use nls && append-libs -lintl
 	econf $(use_enable nls)
 }
 
diff --git a/media-gfx/icoutils/metadata.xml b/media-gfx/icoutils/metadata.xml
index 5753237ba13..9d057a7e66a 100644
--- a/media-gfx/icoutils/metadata.xml
+++ b/media-gfx/icoutils/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-		<maintainer type="person">
+                <maintainer type="person">
                 <email>res@crystalspace3d.org</email>
                 <name>Frank Richter (upstream)</name>
         </maintainer>