diff --git a/3rdparty/ext_iconv/CMakeLists.txt b/3rdparty/ext_iconv/CMakeLists.txt
index 35f33a65e5..f9c7f8e52d 100644
--- a/3rdparty/ext_iconv/CMakeLists.txt
+++ b/3rdparty/ext_iconv/CMakeLists.txt
@@ -1,29 +1,29 @@
 SET(PREFIX_ext_iconv "${EXTPREFIX}" )
 if (MINGW)
 ExternalProject_Add( ext_iconv
 	DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-	URL http://files.kde.org/krita/build/dependencies/win-iconv-0.0.6.tar.bz2
-	URL_MD5 1e97ed4d9e7379ff0ee22077256e8c58
+	URL https://api.github.com/repos/win-iconv/win-iconv/tarball/v0.0.8
+	URL_MD5 e5ce777bbc364c7c797ad8628a59966f
 	
     INSTALL_DIR ${PREFIX_ext_iconv}
 	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_iconv} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
 
 	UPDATE_COMMAND ""
 )
 else ()
 ExternalProject_Add( ext_iconv
 	DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-	URL http://files.kde.org/krita/build/dependencies/libiconv-1.14.tar.gz
-	URL_MD5 e34509b1623cec449dfeb73d7ce9c6c6
+	URL https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz
+	URL_MD5 7d2a800b952942bb2880efb00cfd524c
 	
     INSTALL_DIR ${PREFIX_ext_iconv}
     PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/iconv.diff
 	CONFIGURE_COMMAND ./configure --prefix=${PREFIX_ext_iconv}  ${GLOBAL_AUTOMAKE_PROFILE}
     BUILD_COMMAND make
     INSTALL_COMMAND make install
 	
     UPDATE_COMMAND ""
 	BUILD_IN_SOURCE 1
 )
 
 endif ()
diff --git a/3rdparty/ext_iconv/iconv.diff b/3rdparty/ext_iconv/iconv.diff
index 0313127ca9..6962a9d6fa 100644
--- a/3rdparty/ext_iconv/iconv.diff
+++ b/3rdparty/ext_iconv/iconv.diff
@@ -1,13 +1,13 @@
 diff --git a/srclib/stdio.in.h b/srclib/stdio.in.h
-index 473c84c..2990bef 100644
+index 4a8aa55..9036d29 100644
 --- a/srclib/stdio.in.h
 +++ b/srclib/stdio.in.h
-@@ -695,7 +695,7 @@ _GL_CXXALIASWARN (gets);
- /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
+@@ -751,7 +751,7 @@ _GL_WARN_ON_USE (getline, "getline is unportable - "
+    removed it.  */
+ #undef gets
+ #if HAVE_RAW_DECL_GETS && !defined __cplusplus
 -_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
 +//_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
  #endif
  
- 
+ #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@