diff --git a/games-fps/prboom-plus/metadata.xml b/games-fps/prboom-plus/metadata.xml
index c05b6d7832b51..9ea5253b83db4 100644
--- a/games-fps/prboom-plus/metadata.xml
+++ b/games-fps/prboom-plus/metadata.xml
@@ -20,7 +20,7 @@
 		<flag name="dumb">Enable support for various tracker-style music formats via <pkg>media-libs/dumb</pkg></flag>
 		<flag name="fluidsynth">Enable support for MIDI via <pkg>media-sound/fluidsynth</pkg></flag>
 		<flag name="net">Enable support for network play</flag>
-		<flag name="nonfree">Enable non-free components</flag>
+		<flag name="non-free">Enable non-free components</flag>
 		<flag name="portmidi">Enable support for MIDI via <pkg>media-libs/portmidi</pkg></flag>
 		<flag name="sdl-image">Enable support for high-resolution texture support via <pkg>media-libs/sdl-image</pkg></flag>
 		<flag name="sdl-mixer">Enable support for MIDI via <pkg>media-libs/sdl-mixer</pkg></flag>
diff --git a/games-fps/prboom-plus/prboom-plus-2.5.1.4.ebuild b/games-fps/prboom-plus/prboom-plus-2.5.1.4.ebuild
index 29196ddfd2eaf..aab17006b4b1f 100644
--- a/games-fps/prboom-plus/prboom-plus-2.5.1.4.ebuild
+++ b/games-fps/prboom-plus/prboom-plus-2.5.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,11 +14,11 @@ HOMEPAGE="https://prboom-plus.sourceforge.net"
 SRC_URI="https://github.com/coelckers/prboom-plus/archive/f96f891d068dcc5ec52ed91056b46d27e9a8462d.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+
-	nonfree? ( freedist )
-	!nonfree? ( BSD )"
+	non-free? ( freedist )
+	!non-free? ( BSD )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="dumb fluidsynth mad net nonfree +opengl pcre +png portmidi sdl-image +sdl-mixer vorbis"
+IUSE="dumb fluidsynth mad net non-free +opengl pcre +png portmidi sdl-image +sdl-mixer vorbis"
 REQUIRED_USE="sdl-image? ( opengl )"
 
 DEPEND="
@@ -46,7 +46,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		--disable-cpu-opt \
-		$(use_enable nonfree nonfree-graphics) \
+		$(use_enable non-free nonfree-graphics) \
 		$(use_enable opengl gl) \
 		$(use_with dumb) \
 		$(use_with fluidsynth) \