diff --git a/media-fonts/intlfonts/intlfonts-1.2.1-r1.ebuild b/media-fonts/intlfonts/intlfonts-1.2.1-r1.ebuild
index f9eef1f9f50bd..350e486b4ae71 100644
--- a/media-fonts/intlfonts/intlfonts-1.2.1-r1.ebuild
+++ b/media-fonts/intlfonts/intlfonts-1.2.1-r1.ebuild
@@ -9,16 +9,22 @@ DESCRIPTION="International X11 fixed fonts"
HOMEPAGE="https://www.gnu.org/directory/intlfonts.html"
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-LICENSE="public-domain HPND free-noncomm"
+LICENSE="public-domain HPND non-free? ( free-noncomm )"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE="bdf"
+IUSE="bdf non-free"
DEPEND="x11-apps/bdftopcf
>=x11-apps/mkfontscale-1.2.0"
DOCS=( ChangeLog NEWS README Emacs.ap )
+src_prepare() {
+ default
+ # Tibetan fonts have a non-commercial restriction
+ use non-free || rm Asian/tib*.bdf || die
+}
+
src_configure() {
local myconf=(
--with-fontdir=/usr/share/fonts/${PN}
diff --git a/media-fonts/intlfonts/metadata.xml b/media-fonts/intlfonts/metadata.xml
index 7d1842f83aff0..8fa31783a57d1 100644
--- a/media-fonts/intlfonts/metadata.xml
+++ b/media-fonts/intlfonts/metadata.xml
@@ -6,6 +6,7 @@
Fonts