diff --git a/converters/iconv/Makefile b/converters/iconv/Makefile
index 509e1d68f194..d0bb4ba23494 100644
--- a/converters/iconv/Makefile
+++ b/converters/iconv/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	iconv
 PORTVERSION=	2.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	converters
 MASTER_SITES=	LOCAL/bland
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Charset conversion library and utilities
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		shebangfix perl5 uidfix
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 SHEBANG_FILES=	iconv_builtin ccs/iconv_mktbl
 
 OPTIONS_DEFINE=	CCSUTIL
 OPTIONS_DEFAULT=CCSUTIL
 
 OPTIONS_SUB=	yes
 
 CCSUTIL_DESC=	Install Coded character set (CCS) util
 
 CCSUTIL_USE=	PERL5=run
 CCSUTIL_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-ccs_Makefile
 
 .include <bsd.port.pre.mk>
 
 .if defined(NO_PROFILE) || ${OSVERSION} > 1400001
 PLIST_SUB+=	PROFILE="@comment "
 .else
 PLIST_SUB+=	PROFILE=""
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/converters/iconv/files/patch-Makefile.inc b/converters/iconv/files/patch-Makefile.inc
new file mode 100644
index 000000000000..c2b07d817972
--- /dev/null
+++ b/converters/iconv/files/patch-Makefile.inc
@@ -0,0 +1,11 @@
+--- Makefile.inc.orig	2000-11-27 22:11:47 UTC
++++ Makefile.inc
+@@ -3,7 +3,7 @@ ICONV_BUILTIN_CHARSETS =	us-ascii utf-8 ucs-4-internal
+ .endif
+ 
+ .if defined(PREFIX)
+-MANDIR =	${PREFIX}/man/man
++MANDIR =	${PREFIX}/share/man/man
+ NOOBJ =
+ .else
+ PREFIX =	/usr
diff --git a/converters/iconv/pkg-plist b/converters/iconv/pkg-plist
index 157581488aed..8bf7c6ef3239 100644
--- a/converters/iconv/pkg-plist
+++ b/converters/iconv/pkg-plist
@@ -1,42 +1,42 @@
 bin/biconv
 %%CCSUTIL%%bin/iconv_mktbl
 include/biconv.h
 lib/libbiconv.a
 lib/libbiconv.so
 lib/libbiconv.so.2
 %%PROFILE%%lib/libbiconv_p.a
 libexec/iconv/euc-jp.so
 libexec/iconv/euc-kr.so
 libexec/iconv/euc-tw.so
 libexec/iconv/gb2312.so
 libexec/iconv/iso-10646-ucs-2.so
 libexec/iconv/iso-10646-ucs-4.so
 libexec/iconv/ucs-2-internal.so
 libexec/iconv/utf-16.so
-man/man1/biconv.1.gz
-man/man3/biconv.3.gz
-man/man3/biconv_close.3.gz
-man/man3/biconv_open.3.gz
+share/man/man1/biconv.1.gz
+share/man/man3/biconv.3.gz
+share/man/man3/biconv_close.3.gz
+share/man/man3/biconv_open.3.gz
 %%DATADIR%%/big5.cct
 %%DATADIR%%/charset.aliases
 %%DATADIR%%/cns11643-plane1.cct
 %%DATADIR%%/cns11643-plane14.cct
 %%DATADIR%%/cns11643-plane2.cct
 %%DATADIR%%/cp775.cct
 %%DATADIR%%/cp850.cct
 %%DATADIR%%/cp852.cct
 %%DATADIR%%/cp855.cct
 %%DATADIR%%/cp866.cct
 %%DATADIR%%/gb_2312-80.cct
 %%DATADIR%%/iso-8859-1.cct
 %%DATADIR%%/iso-8859-15.cct
 %%DATADIR%%/iso-8859-2.cct
 %%DATADIR%%/iso-8859-4.cct
 %%DATADIR%%/iso-8859-5.cct
 %%DATADIR%%/jis_x0201.cct
 %%DATADIR%%/jis_x0208-1983.cct
 %%DATADIR%%/jis_x0212-1990.cct
 %%DATADIR%%/koi8-r.cct
 %%DATADIR%%/koi8-u.cct
 %%DATADIR%%/ksx1001.cct
 %%DATADIR%%/shift_jis.cct