diff --git a/fonts/FiraCode/Makefile b/fonts/FiraCode/Makefile
index 633b2792c668..b8d2e520ab6e 100644
--- a/fonts/FiraCode/Makefile
+++ b/fonts/FiraCode/Makefile
@@ -1,11 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2019/11/02 22:24:37 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2019/12/11 13:52:07 mef Exp $
 
-DISTNAME=	FiraCode_1.204
-PKGNAME=	${DISTNAME:S/_/-/}
+DISTNAME=	FiraCode-2
 CATEGORIES=	fonts
 MASTER_SITES=	${MASTER_SITE_GITHUB:=tonsky/}
-GITHUB_RELEASE=	${DISTNAME:S/FiraCode_//}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/tonsky/FiraCode/
@@ -16,10 +13,9 @@ USE_LANGUAGES=		# none
 NO_BUILD=		yes
 FONTS_DIRS.ttf=		${PREFIX}/share/fonts/X11/OTF ${PREFIX}/share/fonts/X11/TTF
 INSTALLATION_DIRS=	share/fonts/X11/OTF share/fonts/X11/TTF
-WRKSRC=			${WRKDIR}
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/otf/*.otf  ${DESTDIR}${PREFIX}/share/fonts/X11/OTF
-	${INSTALL_DATA} ${WRKSRC}/ttf/*.ttf  ${DESTDIR}${PREFIX}/share/fonts/X11/TTF
+	${INSTALL_DATA} ${WRKSRC}/distr/otf/*.otf  ${DESTDIR}${PREFIX}/share/fonts/X11/OTF
+	${INSTALL_DATA} ${WRKSRC}/distr/ttf/*.ttf  ${DESTDIR}${PREFIX}/share/fonts/X11/TTF
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/FiraCode/distinfo b/fonts/FiraCode/distinfo
index 5f967fd4a2bc..c7fe1761c6ce 100644
--- a/fonts/FiraCode/distinfo
+++ b/fonts/FiraCode/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2016/11/30 14:24:47 mef Exp $
+$NetBSD: distinfo,v 1.5 2019/12/11 13:52:07 mef Exp $
 
-SHA1 (FiraCode_1.204.zip) = 591b6f9bb9800431355f052baef24bac336afd25
-RMD160 (FiraCode_1.204.zip) = f50ca3ad67c6074c5681c1d4fd4115e7c36472f6
-SHA512 (FiraCode_1.204.zip) = 6818ed2eb8607bc47df8953db804b0ffd8f62cc644c55cdd0a0a42a082b61878f9775f3654e986932d3316a2c8e491ee5ee4c81704bd066e69b4be920f4bfcc8
-Size (FiraCode_1.204.zip) = 2176721 bytes
+SHA1 (FiraCode-2.tar.gz) = 6f27f6f65615114addb0a21eb1baad2115587f92
+RMD160 (FiraCode-2.tar.gz) = 471f097b0b8691f929f4c1fd2c3c51936ecf70e3
+SHA512 (FiraCode-2.tar.gz) = 313f11f1550d964119c2576bc988ca7d009ebd670c93b3c4a29583f91499166816ed326fdb5a5082ed7c7a33c49263e627a3356cc739aa1a8e34689820081399
+Size (FiraCode-2.tar.gz) = 7100481 bytes