diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 2baa30db45d4..e791b0ff05ef 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	libiconv
-PORTVERSION=	1.16
+PORTVERSION=	1.17
 CATEGORIES=	converters devel
 MASTER_SITES=	GNU
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	Character set conversion library
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		libtool
 USE_CSTD=	gnu89
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static \
 		--disable-nls \
 		--docdir=${DOCSDIR} \
 		am_cv_func_iconv=no
 INSTALL_TARGET=	install-strip
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	DOCS ENCODINGS
 OPTIONS_DEFAULT=ENCODINGS
 ENCODINGS_DESC=	Include extra character sets
 
 ENCODINGS_CONFIGURE_ENABLE=	extra-encodings
 
 post-patch:
 	@${REINPLACE_CMD} -e 's:ei_ksc5601:ei_euc_kr:g' ${WRKSRC}/lib/aliases.h
 	@${REINPLACE_CMD} -e 's:gawk:awk:g' ${WRKSRC}/configure \
 		${WRKSRC}/libcharset/configure
 
 .include <bsd.port.mk>
diff --git a/converters/libiconv/distinfo b/converters/libiconv/distinfo
index 89e6e628e122..bfe16318e834 100644
--- a/converters/libiconv/distinfo
+++ b/converters/libiconv/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1569891121
-SHA256 (libiconv-1.16.tar.gz) = e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04
-SIZE (libiconv-1.16.tar.gz) = 5166734
+TIMESTAMP = 1655671090
+SHA256 (libiconv-1.17.tar.gz) = 8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313
+SIZE (libiconv-1.17.tar.gz) = 5413283
diff --git a/converters/libiconv/files/patch-include-iconv.h.in b/converters/libiconv/files/patch-include-iconv.h.in
index 071ad7d160bb..cd0e7e17567c 100644
--- a/converters/libiconv/files/patch-include-iconv.h.in
+++ b/converters/libiconv/files/patch-include-iconv.h.in
@@ -1,76 +1,76 @@
 --- include/iconv.h.in.orig	2019-04-26 18:48:39 UTC
 +++ include/iconv.h.in
 @@ -20,8 +20,10 @@
  #ifndef _LIBICONV_H
  #define _LIBICONV_H
  
 +#ifndef LIBICONV_PLUG
- #define _LIBICONV_VERSION 0x0110    /* version number: (major<<8) + minor */
+ #define _LIBICONV_VERSION 0x0111    /* version number: (major<<8) + minor */
  extern @DLL_VARIABLE@ int _libiconv_version; /* Likewise */
 +#endif
  
  /* We would like to #include any system header file which could define
     iconv_t, 1. in order to eliminate the risk that the user gets compilation
 @@ -93,7 +95,6 @@ extern int iconv_close (iconv_t cd);
  #endif
  
  
 -#ifndef LIBICONV_PLUG
  
  /* Nonstandard extensions. */
  
 @@ -126,12 +127,16 @@ typedef struct {
  /* Allocates descriptor for code conversion from encoding ‘fromcode’ to
     encoding ‘tocode’ into preallocated memory. Returns an error indicator
     (0 or -1 with errno set). */
 +#ifndef LIBICONV_PLUG
  #define iconv_open_into libiconv_open_into
 +#endif
  extern int iconv_open_into (const char* tocode, const char* fromcode,
                              iconv_allocation_t* resultp);
  
  /* Control of attributes. */
 +#ifndef LIBICONV_PLUG
  #define iconvctl libiconvctl
 +#endif
  extern int iconvctl (iconv_t cd, int request, void* argument);
  
  /* Hook performed after every successful conversion of a Unicode character. */
 @@ -209,9 +214,15 @@ struct iconv_fallbacks {
  #define ICONV_SET_DISCARD_ILSEQ   4  /* const int *argument */
  #define ICONV_SET_HOOKS           5  /* const struct iconv_hooks *argument */
  #define ICONV_SET_FALLBACKS       6  /* const struct iconv_fallbacks *argument */
 +#ifdef LIBICONV_PLUG
 +#define ICONV_GET_ILSEQ_INVALID 128
 +#define ICONV_SET_ILSEQ_INVALID 129
 +#endif
  
  /* Listing of locale independent encodings. */
 +#ifndef LIBICONV_PLUG
  #define iconvlist libiconvlist
 +#endif
  extern void iconvlist (int (*do_one) (unsigned int namescount,
                                        const char * const * names,
                                        void* data),
 @@ -223,6 +234,7 @@ extern const char * iconv_canonicalize (
  
  /* Support for relocatable packages.  */
  
 +#ifndef LIBICONV_PLUG
  /* Sets the original and the current installation prefix of the package.
     Relocation simply replaces a pathname starting with the original prefix
     by the corresponding pathname with the current prefix instead.  Both
 @@ -230,12 +242,12 @@ extern const char * iconv_canonicalize (
     instead of "/").  */
  extern void libiconv_set_relocation_prefix (const char *orig_prefix,
                                              const char *curr_prefix);
 +#endif
  
  #ifdef __cplusplus
  }
  #endif
  
 -#endif
  
  
  #endif /* _LIBICONV_H */