diff --git a/srcpkgs/font-fira-otf/template b/srcpkgs/font-fira-otf/template
index ebfbd5d4ab6..921fcb8d30d 100644
--- a/srcpkgs/font-fira-otf/template
+++ b/srcpkgs/font-fira-otf/template
@@ -1,11 +1,10 @@
 # Template file for 'font-fira-otf'
 pkgname=font-fira-otf
 version=4.202
-revision=2
+revision=3
 archs=noarch
-wrksrc=Fira-${version}
+wrksrc="Fira-${version}"
 depends="font-util xbps-triggers"
-font_dirs="/usr/share/fonts/OTF"
 short_desc="Mozilla's new typeface OTF, used in Firefox OS"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="OFL-1.1"
@@ -13,11 +12,21 @@ homepage="http://mozilla.github.io/Fira/"
 distfiles="https://github.com/mozilla/Fira/archive/${version}.tar.gz"
 checksum=d86269657387f144d77ba12011124f30f423f70672e1576dc16f918bb16ddfe4
 
+font_dirs="/usr/share/fonts/OTF"
+
 do_install() {
 	vmkdir usr/share/fonts/OTF
+	vmkdir usr/share/fonts/TTF
 
-	for files in otf/*.otf; do
-		vinstall ${files} 0644 \
-		/usr/share/fonts/OTF/
-	done
+	vcopy otf/*.otf usr/share/fonts/OTF
+	vcopy ttf/*.ttf usr/share/fonts/TTF
+}
+
+font-fira-ttf_package() {
+	archs=noarch
+	font_dirs="/usr/share/fonts/TTF"
+	depends="font-util xbps-triggers"
+	pkg_install() {
+		vmove usr/share/fonts/TTF
+	}
 }
diff --git a/srcpkgs/font-fira-ttf b/srcpkgs/font-fira-ttf
new file mode 120000
index 00000000000..932f3a9f5ae
--- /dev/null
+++ b/srcpkgs/font-fira-ttf
@@ -0,0 +1 @@
+font-fira-otf
\ No newline at end of file
diff --git a/srcpkgs/font-fira-ttf/template b/srcpkgs/font-fira-ttf/template
deleted file mode 100644
index c0f19c72565..00000000000
--- a/srcpkgs/font-fira-ttf/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'font-fira-ttf'
-pkgname=font-fira-ttf
-version=4.202
-revision=2
-archs=noarch
-wrksrc=Fira-${version}
-depends="font-util xbps-triggers"
-font_dirs="/usr/share/fonts/TTF"
-short_desc="Mozilla's new typeface TTF, used in Firefox OS"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="OFL-1.1"
-homepage="http://mozilla.github.io/Fira/"
-distfiles="https://github.com/mozilla/Fira/archive/${version}.tar.gz"
-checksum=d86269657387f144d77ba12011124f30f423f70672e1576dc16f918bb16ddfe4
-
-do_install() {
-	vmkdir usr/share/fonts/TTF
-
-	for files in ttf/*.ttf; do
-		vinstall ${files} 0644 \
-		/usr/share/fonts/TTF/
-	done
-}