diff --git a/misc/figlet/Makefile b/misc/figlet/Makefile
index 604ba036a640..4a572017a87c 100644
--- a/misc/figlet/Makefile
+++ b/misc/figlet/Makefile
@@ -1,34 +1,35 @@
 PORTNAME=	figlet
 PORTVERSION=	2.2.5
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.figlet.org/pub/figlet/program/unix/ \
 		LOCAL/obrien
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	SysV banner-like program prints strings in large fancy ASCII art
 WWW=		http://www.figlet.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 MAKE_ENV=	datadir=${DATADIR} prefix=${PREFIX}
 MAKE_ARGS=	LD=${CC}
 TEST_TARGET=	check
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/figlet ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/chkfont ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/figlist ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/showfigfonts ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/fonts/*.flf ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts/*.flc ${STAGEDIR}${DATADIR}
-	${INSTALL_MAN} ${WRKSRC}/*.6 ${STAGEDIR}${MANPREFIX}/man/man6
+	${INSTALL_PROGRAM} ${WRKSRC}/figlet ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/chkfont ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${WRKSRC}/figlist ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${WRKSRC}/showfigfonts ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_DATA} ${WRKSRC}/fonts/*.flf ${STAGEDIR}${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/fonts/*.flc ${STAGEDIR}${DATADIR}/
+	${INSTALL_MAN} ${WRKSRC}/*.6 ${STAGEDIR}${MANPREFIX}/share/man/man6/
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/figfont.txt ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/figfont.txt ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/misc/figlet/pkg-plist b/misc/figlet/pkg-plist
index 225c34c774c6..a7cb748468c9 100644
--- a/misc/figlet/pkg-plist
+++ b/misc/figlet/pkg-plist
@@ -1,66 +1,66 @@
 bin/chkfont
 bin/figlet
 bin/figlist
 bin/showfigfonts
 %%DATADIR%%/646-ca.flc
 %%DATADIR%%/646-ca2.flc
 %%DATADIR%%/646-cn.flc
 %%DATADIR%%/646-cu.flc
 %%DATADIR%%/646-de.flc
 %%DATADIR%%/646-dk.flc
 %%DATADIR%%/646-es.flc
 %%DATADIR%%/646-es2.flc
 %%DATADIR%%/646-fr.flc
 %%DATADIR%%/646-gb.flc
 %%DATADIR%%/646-hu.flc
 %%DATADIR%%/646-irv.flc
 %%DATADIR%%/646-it.flc
 %%DATADIR%%/646-jp.flc
 %%DATADIR%%/646-kr.flc
 %%DATADIR%%/646-no.flc
 %%DATADIR%%/646-no2.flc
 %%DATADIR%%/646-pt.flc
 %%DATADIR%%/646-pt2.flc
 %%DATADIR%%/646-se.flc
 %%DATADIR%%/646-se2.flc
 %%DATADIR%%/646-yu.flc
 %%DATADIR%%/8859-2.flc
 %%DATADIR%%/8859-3.flc
 %%DATADIR%%/8859-4.flc
 %%DATADIR%%/8859-5.flc
 %%DATADIR%%/8859-7.flc
 %%DATADIR%%/8859-8.flc
 %%DATADIR%%/8859-9.flc
 %%DATADIR%%/banner.flf
 %%DATADIR%%/big.flf
 %%DATADIR%%/block.flf
 %%DATADIR%%/bubble.flf
 %%DATADIR%%/digital.flf
 %%DATADIR%%/frango.flc
 %%DATADIR%%/hz.flc
 %%DATADIR%%/ilhebrew.flc
 %%DATADIR%%/ivrit.flf
 %%DATADIR%%/jis0201.flc
 %%DATADIR%%/koi8r.flc
 %%DATADIR%%/lean.flf
 %%DATADIR%%/mini.flf
 %%DATADIR%%/mnemonic.flf
 %%DATADIR%%/moscow.flc
 %%DATADIR%%/script.flf
 %%DATADIR%%/shadow.flf
 %%DATADIR%%/slant.flf
 %%DATADIR%%/small.flf
 %%DATADIR%%/smscript.flf
 %%DATADIR%%/smshadow.flf
 %%DATADIR%%/smslant.flf
 %%DATADIR%%/standard.flf
 %%DATADIR%%/term.flf
 %%DATADIR%%/upper.flc
 %%DATADIR%%/ushebrew.flc
 %%DATADIR%%/uskata.flc
 %%DATADIR%%/utf8.flc
-man/man6/chkfont.6.gz
-man/man6/figlet.6.gz
-man/man6/figlist.6.gz
-man/man6/showfigfonts.6.gz
 %%PORTDOCS%%%%DOCSDIR%%/figfont.txt
+share/man/man6/chkfont.6.gz
+share/man/man6/figlet.6.gz
+share/man/man6/figlist.6.gz
+share/man/man6/showfigfonts.6.gz