diff --git a/media-fonts/firge/firge-0.3.0.ebuild b/media-fonts/firge/firge-0.3.0-r1.ebuild
similarity index 53%
rename from media-fonts/firge/firge-0.3.0.ebuild
rename to media-fonts/firge/firge-0.3.0-r1.ebuild
index f1b363c156..2ce9ffaa1e 100644
--- a/media-fonts/firge/firge-0.3.0.ebuild
+++ b/media-fonts/firge/firge-0.3.0-r1.ebuild
@@ -5,15 +5,15 @@ EAPI=8
 
 inherit font
 
-MY_PN="${PN^}"
 MY_PV="v${PV}"
-MY_P="${MY_PN}_${MY_PV}"
-MY_P_NF="${MY_PN}Nerd_${MY_PV}"
+MY_P="Firge_${MY_PV}"
+MY_P_NF="FirgeNerd_${MY_PV}"
 
 DESCRIPTION="Firge is a composite font of Fira Mono and GenShin-Gothic."
 HOMEPAGE="https://github.com/yuru7/Firge"
-SRC_URI="https://github.com/yuru7/Firge/releases/download/${MY_PV}/${MY_P}.zip
-	nerdfonts? ( https://github.com/yuru7/Firge/releases/download/${MY_PV}/${MY_P_NF}.zip )
+SRC_URI="
+	https://github.com/yuru7/Firge/releases/download/${MY_PV}/${MY_P}.zip
+	https://github.com/yuru7/Firge/releases/download/${MY_PV}/${MY_P_NF}.zip
 "
 
 S="${WORKDIR}"
@@ -22,14 +22,10 @@ FONT_SUFFIX="ttf"
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="nerdfonts"
 
 BDEPEND="app-arch/unzip"
 
-src_unpack() {
-	default
-	mv ${MY_P}/*.${FONT_SUFFIX} . || die
-	if use nerdfonts; then
-		mv ${MY_P_NF}/*.${FONT_SUFFIX} . || die
-	fi
+src_install() {
+	mv ${MY_P}/* ${MY_P_NF}/* . || die
+	font_src_install
 }
diff --git a/media-fonts/firge/metadata.xml b/media-fonts/firge/metadata.xml
index d9e2306c8d..63564ce0d8 100644
--- a/media-fonts/firge/metadata.xml
+++ b/media-fonts/firge/metadata.xml
@@ -5,10 +5,6 @@
     <email>dev@dyama.net</email>
     <name>Daichi Yamamoto</name>
   </maintainer>
-  <stabilize-allarches />
-  <use>
-    <flag name="nerdfonts">Install Nerd Fonts composite version</flag>
-  </use>
   <upstream>
     <remote-id type="github">yuru7/Firge</remote-id>
   </upstream>