diff --git a/x11-fonts/averiagwf/Makefile b/x11-fonts/averiagwf/Makefile
index 94777daafe4e..4f67c3b11115 100644
--- a/x11-fonts/averiagwf/Makefile
+++ b/x11-fonts/averiagwf/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	averiagwf
 PORTVERSION=	1.00
 PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://iotic.com/averia/font-files/GWF/
 DISTNAME=	AveriaGWF
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} AveriaSansGWF${EXTRACT_SUFX} AveriaSerifGWF${EXTRACT_SUFX}
+DIST_SUBDIR=	fonts/${PORTNAME}/${DISTVERSION}
 
 MAINTAINER=	alfix86@gmail.com
 COMMENT=	Average font
 WWW=		http://iotic.com/averia/
 
 LICENSE=	OFL11
 LICENSE_FILE=	${WRKSRC}/OFL.txt
 
 USES=		fonts zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 PORTDOCS=	FONTLOG.txt
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${MKDIR} ${STAGEDIR}${FONTSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTSDIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/averiagwf/distinfo b/x11-fonts/averiagwf/distinfo
index 879430f8ca3a..34942bc0668c 100644
--- a/x11-fonts/averiagwf/distinfo
+++ b/x11-fonts/averiagwf/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1492130262
-SHA256 (AveriaGWF.zip) = 1265413dd2574455ee2c473cc12561bd79b3e39f96de328447109a12a7b7e345
-SIZE (AveriaGWF.zip) = 488491
-SHA256 (AveriaSansGWF.zip) = f9f40b667f15c8432b9d4288ad8ee351344002a6d09413fe047b567c008ee67c
-SIZE (AveriaSansGWF.zip) = 425675
-SHA256 (AveriaSerifGWF.zip) = 6e121d99a63f9f2a57669bef577808a47468ba990c7b809e78052e60ad85cdc6
-SIZE (AveriaSerifGWF.zip) = 432036
+TIMESTAMP = 1784557806
+SHA256 (fonts/averiagwf/1.00/AveriaGWF.zip) = 1265413dd2574455ee2c473cc12561bd79b3e39f96de328447109a12a7b7e345
+SIZE (fonts/averiagwf/1.00/AveriaGWF.zip) = 488491
+SHA256 (fonts/averiagwf/1.00/AveriaSansGWF.zip) = f9f40b667f15c8432b9d4288ad8ee351344002a6d09413fe047b567c008ee67c
+SIZE (fonts/averiagwf/1.00/AveriaSansGWF.zip) = 425675
+SHA256 (fonts/averiagwf/1.00/AveriaSerifGWF.zip) = 6e121d99a63f9f2a57669bef577808a47468ba990c7b809e78052e60ad85cdc6
+SIZE (fonts/averiagwf/1.00/AveriaSerifGWF.zip) = 432036