diff --git a/textproc/bsd-spell/Makefile b/textproc/bsd-spell/Makefile
index 4268e1be8157..5cac537f2704 100644
--- a/textproc/bsd-spell/Makefile
+++ b/textproc/bsd-spell/Makefile
@@ -1,32 +1,38 @@
 PORTNAME=	bsd-spell
-PORTREVISION=	2
 DISTVERSIONPREFIX=	v
-DISTVERSION=		1.0.1
+DISTVERSION=	1.0.1
+PORTREVISION=	3
 CATEGORIES=	textproc
 
 MAINTAINER=	gbe@FreeBSD.org
 COMMENT=	This is a port of the 4.4BSD spell command
 WWW=		https://github.com/gbergling/bsdspell
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	gbergling
 GH_PROJECT=	bsdspell
 
+post-extract:
+	${REINPLACE_CMD} -e 's,/usr/share/,${PREFIX}/share/,' \
+	    ${WRKSRC}/usr.bin/spell/spell.sh ${WRKSRC}/usr.bin/spell/spell.1
+	${REINPLACE_CMD} -E -e 's,\<SPELL\>,B&,' -e 's,\<spell\>,b&,' \
+	    ${WRKSRC}/usr.bin/spell/spell.1
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/usr.bin/spell/spellprog ${STAGEDIR}${PREFIX}/libexec
 	${INSTALL_PROGRAM} ${WRKSRC}/usr.bin/deroff/deroff ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/usr.bin/spell/spell.sh ${STAGEDIR}${PREFIX}/bin/bspell
 
 	${INSTALL_DATA} ${WRKSRC}/usr.bin/spell/american ${STAGEDIR}${PREFIX}/share/dict
 	${INSTALL_DATA} ${WRKSRC}/usr.bin/spell/british ${STAGEDIR}${PREFIX}/share/dict
 	${INSTALL_DATA} ${WRKSRC}/usr.bin/spell/special.4bsd ${STAGEDIR}${PREFIX}/share/dict
 	${INSTALL_DATA} ${WRKSRC}/usr.bin/spell/special.math ${STAGEDIR}${PREFIX}/share/dict
 	${INSTALL_DATA} ${WRKSRC}/usr.bin/spell/stop ${STAGEDIR}${PREFIX}/share/dict
 
-	${INSTALL_MAN} ${WRKSRC}/usr.bin/spell/spell.1.gz ${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_MAN} ${WRKSRC}/usr.bin/spell/spell.1.gz ${STAGEDIR}${PREFIX}/share/man/man1/bspell.1.gz
 	${INSTALL_MAN} ${WRKSRC}/usr.bin/deroff/deroff.1.gz ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/textproc/bsd-spell/pkg-plist b/textproc/bsd-spell/pkg-plist
index 76edb9a3d79a..b54a61fe4b05 100644
--- a/textproc/bsd-spell/pkg-plist
+++ b/textproc/bsd-spell/pkg-plist
@@ -1,10 +1,10 @@
 libexec/spellprog
 bin/bspell
 bin/deroff
-share/man/man1/spell.1.gz
+share/man/man1/bspell.1.gz
 share/man/man1/deroff.1.gz
 share/dict/american
 share/dict/british
 share/dict/special.4bsd
 share/dict/special.math
 share/dict/stop