diff --git a/converters/iconv/Makefile b/converters/iconv/Makefile
index 5b283fe586f3..90e228ed3f44 100644
--- a/converters/iconv/Makefile
+++ b/converters/iconv/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	iconv
 PORTVERSION=	2.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	converters
 MASTER_SITES=	LOCAL/bland
 
 MAINTAINER=	bland@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-ces__Makefile b/converters/iconv/files/patch-ces__Makefile
index 5c39a6915660..7f5c8a2961cd 100644
--- a/converters/iconv/files/patch-ces__Makefile
+++ b/converters/iconv/files/patch-ces__Makefile
@@ -1,34 +1,37 @@
 --- ces/Makefile	2002/03/17 11:07:44	1.1
 +++ ces/Makefile	2002/03/17 11:07:56
 @@ -10,7 +10,7 @@
  LIB=		ces
  SRCS=		ces_builtin.c ${CHARSETS_C}
  
 -LDADD =		-L${.CURDIR}/../lib -liconv
 +LDADD =		-L${.CURDIR}/../lib -lbiconv
  
  INTERNALLIB =
  
-@@ -27,9 +27,9 @@ ces_builtin.c:	${CHARSETS_C} ${CHARSETS_
+@@ -27,11 +27,11 @@ ces_builtin.c:	${CHARSETS_C} ${CHARSETS_O}
  		${.CURDIR}/../iconv_builtin -mo ${.TARGET} \
  			${CHARSETS_C} PIC ${CHARSETS_O}
  
 -.SUFFIXES:	.so .So
 +.SUFFIXES:	.so .So .pico
  
 -.So.so:
 +.So.so .pico.so:
  	@${LDDESTDIRENV} ${CC} -shared -Wl,-x -o ${.TARGET} \
- 		-Wl,-soname,${.TARGET} `lorder ${.ALLSRC} | tsort -q` \
+-		-Wl,-soname,${.TARGET} `lorder ${.ALLSRC} | tsort -q` \
++		-Wl,-soname,${.TARGET} ${.ALLSRC} \
  		${LDDESTDIR} ${LDADD}
+ 
+ beforeinstall:
 @@ -41,8 +41,8 @@ beforeinstall:
  		${INSTALLFLAGS} ${SHLINSTALLFLAGS} ${CHARSETS_SO} \
  		${DESTDIR}${MODULEDIR}
  
 -CLEANFILES +=	*.so *.So ces_builtin.c *.lst
 +CLEANFILES +=	*.so *.So *.pico ces_builtin.c *.lst
  
  .include <bsd.lib.mk>
  
 -.SUFFIXES:	.so .So
 +.SUFFIXES:	.so .So .pico