diff --git a/x11-fonts/ubuntu-font/Makefile b/x11-fonts/ubuntu-font/Makefile
index 9f8a7029251e..83a653f2d657 100644
--- a/x11-fonts/ubuntu-font/Makefile
+++ b/x11-fonts/ubuntu-font/Makefile
@@ -1,35 +1,33 @@
 PORTNAME=	ubuntu-font
-PORTVERSION=	0.83
-PORTREVISION=	2
+DISTVERSION=	0.863
 CATEGORIES=	x11-fonts
-MASTER_SITES=	https://assets.ubuntu.com/v1/
-DISTNAME=	0cef8205-${ARCHIVE_NAME}
+MASTER_SITES=	https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/fonts-ubuntu/${DISTVERSION}-0ubuntu1/
+DISTNAME=	fonts-ubuntu_${DISTVERSION}.orig
+
 
 MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	Ubuntu font family
 WWW=		https://design.ubuntu.com/font/
 
 LICENSE=	UFL
 LICENSE_FILE=	${WRKSRC}/LICENCE.txt
 LICENSE_NAME=	Ubuntu Font License (UFL)
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USES=		fonts zip
+USES=		fonts
 
 NO_ARCH=	yes
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${ARCHIVE_NAME}
+WRKSRC=		${WRKDIR}/fonts-ubuntu-${DISTVERSION}
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS
 
-ARCHIVE_NAME=	${PORTNAME}-family-${PORTVERSION}
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.txt ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${FONTSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/ubuntu-font/distinfo b/x11-fonts/ubuntu-font/distinfo
index dde3714ada04..66cd6c116c14 100644
--- a/x11-fonts/ubuntu-font/distinfo
+++ b/x11-fonts/ubuntu-font/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1571843036
-SHA256 (0cef8205-ubuntu-font-family-0.83.zip) = 61a2b342526fd552f19fef438bb9211a8212de19ad96e32a1209c039f1d68ecf
-SIZE (0cef8205-ubuntu-font-family-0.83.zip) = 2190387
+TIMESTAMP = 1787594476
+SHA256 (fonts-ubuntu_0.863.orig.tar.gz) = dbea8a5a0849673098a5ce33c49d9a7edcaf7787f58d110fad71b3eb75dc21f6
+SIZE (fonts-ubuntu_0.863.orig.tar.gz) = 6785819
diff --git a/x11-fonts/ubuntu-font/pkg-plist b/x11-fonts/ubuntu-font/pkg-plist
index a75f6b141a7e..a5d0570f58a7 100644
--- a/x11-fonts/ubuntu-font/pkg-plist
+++ b/x11-fonts/ubuntu-font/pkg-plist
@@ -1,21 +1,11 @@
-%%FONTSDIR%%/Ubuntu-B.ttf
-%%FONTSDIR%%/Ubuntu-BI.ttf
-%%FONTSDIR%%/Ubuntu-C.ttf
-%%FONTSDIR%%/Ubuntu-L.ttf
-%%FONTSDIR%%/Ubuntu-LI.ttf
-%%FONTSDIR%%/Ubuntu-M.ttf
-%%FONTSDIR%%/Ubuntu-MI.ttf
-%%FONTSDIR%%/Ubuntu-R.ttf
-%%FONTSDIR%%/Ubuntu-RI.ttf
-%%FONTSDIR%%/Ubuntu-Th.ttf
-%%FONTSDIR%%/UbuntuMono-B.ttf
-%%FONTSDIR%%/UbuntuMono-BI.ttf
-%%FONTSDIR%%/UbuntuMono-R.ttf
-%%FONTSDIR%%/UbuntuMono-RI.ttf
 %%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.txt
 %%PORTDOCS%%%%DOCSDIR%%/FONTLOG.txt
 %%PORTDOCS%%%%DOCSDIR%%/LICENCE-FAQ.txt
 %%PORTDOCS%%%%DOCSDIR%%/LICENCE.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/TRADEMARKS.txt
 %%PORTDOCS%%%%DOCSDIR%%/copyright.txt
+%%FONTSDIR%%/Ubuntu-Italic[wdth,wght].ttf
+%%FONTSDIR%%/UbuntuMono-Italic[wght].ttf
+%%FONTSDIR%%/UbuntuMono[wght].ttf
+%%FONTSDIR%%/Ubuntu[wdth,wght].ttf