diff --git a/lang/expect/Makefile b/lang/expect/Makefile
index e6252722f3fb..dd6dbaf630e1 100644
--- a/lang/expect/Makefile
+++ b/lang/expect/Makefile
@@ -1,31 +1,30 @@
 PORTNAME=	expect
 PORTVERSION=	5.45.4
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	lang tcl tk
 MASTER_SITES=	SF/${PORTNAME}/Expect/${PORTVERSION}
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	Sophisticated scripter based on Tcl/Tk
 WWW=		https://expect.sourceforge.net
 
 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/license.terms
 
 USES=		tcl:tea autoreconf
 USE_LDCONFIG=	${LOCALBASE}/lib/${DISTNAME}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 SUB_FILES+=	pkg-message
-SUB_LIST+=	MANPREFIX=${MANPREFIX}
 TEST_TARGET=	test
 MAKE_ENV+=	STRIPPROG=${STRIP_CMD}
 
 post-install:
 	${LN} -sf ${DISTNAME}/lib${DISTNAME}.so \
 		${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.1
 	${LN} -sf lib${PORTNAME}.so.1 ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so
 
 .include <bsd.port.mk>
diff --git a/lang/expect/files/patch-Makefile.in b/lang/expect/files/patch-Makefile.in
index fee7a43dda1c..ddf7408a8d6a 100644
--- a/lang/expect/files/patch-Makefile.in
+++ b/lang/expect/files/patch-Makefile.in
@@ -1,20 +1,36 @@
 --- Makefile.in.orig	2018-02-02 19:15:52 UTC
 +++ Makefile.in
 @@ -239,7 +239,7 @@ install-libraries: libraries $(SCRIPTS)
  	@mkdir -p $(DESTDIR)$(prefix)/bin
  	-for i in $(SCRIPT_LIST) ; do \
  	  if [ -f $$i ] ; then \
 -	    $(INSTALL_PROGRAM) $$i $(DESTDIR)$(prefix)/bin/$$i ; \
 +	    $(INSTALL_SCRIPT) $$i $(DESTDIR)$(prefix)/bin/expect_$$i ; \
  	    rm -f $$i ; \
  	  else true; fi ; \
  	done
-@@ -259,7 +259,7 @@ install-doc: doc
- 	$(INSTALL_DATA) $(srcdir)/libexpect.man $(DESTDIR)$(mandir)/man3/libexpect.3
+@@ -254,12 +254,12 @@ install-doc: doc
+ 	@mkdir -p $(DESTDIR)$(mandir)/man3
+ 	@echo "Installing documentation in $(DESTDIR)$(mandir)"
+ # install Expect man page
+-	$(INSTALL_DATA) $(srcdir)/expect.man $(DESTDIR)$(mandir)/man1/expect.1
++	$(INSTALL_DATA) $(srcdir)/expect.man $(DESTDIR)$(prefix)/share/man/man1/expect.1
+ # install man page for Expect library
+-	$(INSTALL_DATA) $(srcdir)/libexpect.man $(DESTDIR)$(mandir)/man3/libexpect.3
++	$(INSTALL_DATA) $(srcdir)/libexpect.man $(DESTDIR)$(prefix)/share/man/man3/libexpect.3
  	-for i in $(SCRIPT_MANPAGE_LIST) ; do \
  	  if [ -f $(srcdir)/example/$$i.man ] ; then \
 -	    $(INSTALL_DATA) $(srcdir)/example/$$i.man $(DESTDIR)$(mandir)/man1/$$i.1 ; \
-+	    $(INSTALL_DATA) $(srcdir)/example/$$i.man $(DESTDIR)$(mandir)/man1/expect_$$i.1 ; \
++	    $(INSTALL_DATA) $(srcdir)/example/$$i.man $(DESTDIR)$(prefix)/share/man/man1/expect_$$i.1 ; \
  	  else true; fi ; \
  	done
  
+@@ -502,7 +502,7 @@ expect-$(VERSION).tar.gz:	expect-$(VERSION).tar
+ # variable in configure.in
+ #========================================================================
+ 
+-clean:  
++clean:
+ 	-test -z "$(BINARIES)" || rm -f $(BINARIES)
+ 	-rm -f *.$(OBJEXT) core *.core
+ 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
diff --git a/lang/expect/files/pkg-message.in b/lang/expect/files/pkg-message.in
index d422ddaf1a67..bce62bf49b85 100644
--- a/lang/expect/files/pkg-message.in
+++ b/lang/expect/files/pkg-message.in
@@ -1,9 +1,9 @@
 [
 { type: install
   message: <<EOM
 To avoid conflicts, example scripts and man pages have been renamed by
 prefixing them with "expect_".
-They are in %%PREFIX%%/bin and %%MANPREFIX%%/man/man1, respectively.
+They are in %%PREFIX%%/bin and %%PREFIX%%/share/man/man1, respectively.
 EOM
 }
 ]
diff --git a/lang/expect/pkg-plist b/lang/expect/pkg-plist
index 2da1d396cd18..63ecdff321b2 100644
--- a/lang/expect/pkg-plist
+++ b/lang/expect/pkg-plist
@@ -1,43 +1,43 @@
 bin/expect
 bin/expect_autoexpect
 bin/expect_autopasswd
 bin/expect_cryptdir
 bin/expect_decryptdir
 bin/expect_dislocate
 bin/expect_ftp-rfc
 bin/expect_kibitz
 bin/expect_lpunlock
 bin/expect_mkpasswd
 bin/expect_multixterm
 bin/expect_passmass
 bin/expect_rftp
 bin/expect_rlogin-cwd
 bin/expect_timed-read
 bin/expect_timed-run
 bin/expect_tknewsbiff
 bin/expect_tkpasswd
 bin/expect_unbuffer
 bin/expect_weather
 bin/expect_xkibitz
 bin/expect_xpstat
 include/expect.h
 include/expect_comm.h
 include/expect_tcl.h
 include/tcldbg.h
 lib/expect%%PORTVERSION%%/libexpect%%PORTVERSION%%.so
 lib/expect%%PORTVERSION%%/pkgIndex.tcl
 lib/libexpect.so
 lib/libexpect.so.1
-man/man1/expect.1.gz
-man/man1/expect_autoexpect.1.gz
-man/man1/expect_cryptdir.1.gz
-man/man1/expect_decryptdir.1.gz
-man/man1/expect_dislocate.1.gz
-man/man1/expect_kibitz.1.gz
-man/man1/expect_mkpasswd.1.gz
-man/man1/expect_multixterm.1.gz
-man/man1/expect_passmass.1.gz
-man/man1/expect_tknewsbiff.1.gz
-man/man1/expect_unbuffer.1.gz
-man/man1/expect_xkibitz.1.gz
-man/man3/libexpect.3.gz
+share/man/man1/expect.1.gz
+share/man/man1/expect_autoexpect.1.gz
+share/man/man1/expect_cryptdir.1.gz
+share/man/man1/expect_decryptdir.1.gz
+share/man/man1/expect_dislocate.1.gz
+share/man/man1/expect_kibitz.1.gz
+share/man/man1/expect_mkpasswd.1.gz
+share/man/man1/expect_multixterm.1.gz
+share/man/man1/expect_passmass.1.gz
+share/man/man1/expect_tknewsbiff.1.gz
+share/man/man1/expect_unbuffer.1.gz
+share/man/man1/expect_xkibitz.1.gz
+share/man/man3/libexpect.3.gz