diff --git a/compat/vcbuild/Makefile b/compat/vcbuild/Makefile
index cfca611dfc..a9d1a6b92b 100644
--- a/compat/vcbuild/Makefile
+++ b/compat/vcbuild/Makefile
@@ -9,7 +9,8 @@ INST_BIN=$(INST)/bin
 PKGDIR=GEN.PKGS
 
 ##################################################################
-all:	unpack expat libssh libssh_redist curl curl_redist openssl zlib
+all:	unpack expat libssh libssh_redist curl curl_redist openssl zlib \
+	libiconv libiconv_redist
 
 unpack:
 	[ -d $(PKGDIR) ] || mkdir $(PKGDIR)
@@ -38,6 +39,25 @@ expat:	insdir
 	cp -r $(EXPAT_LIB)/* $(INST_LIB)/
 
 
+##################################################################
+
+LIBICONV_VER=1.14.0.11
+LIBICONV_ROOT=$(PKGDIR)/libiconv.$(LIBICONV_VER)/build/native
+LIBICONV_INC=$(LIBICONV_ROOT)/include
+LIBICONV_LIB=$(LIBICONV_ROOT)/lib/v110/x64/Release/dynamic/cdecl
+
+libiconv:	insdir
+	cp -r $(LIBICONV_INC)/* $(INST_INC)/
+	cp -r $(LIBICONV_LIB)/libiconv.lib $(INST_LIB)/iconv.lib
+
+
+LIBICONV_REDIST_ROOT=$(PKGDIR)/libiconv.redist.$(LIBICONV_VER)/build/native
+LIBICONV_REDIST_BIN=$(LIBICONV_REDIST_ROOT)/bin/v110/x64/Release/dynamic/cdecl
+
+libiconv_redist:	insdir
+	cp -r $(LIBICONV_REDIST_BIN)/* $(INST_BIN)/
+
+
 ##################################################################
 
 LIBSSH_VER=1.4.3.3
diff --git a/compat/vcbuild/packages.config b/compat/vcbuild/packages.config
index e6e6d2f63f..ee01be5edb 100644
--- a/compat/vcbuild/packages.config
+++ b/compat/vcbuild/packages.config
@@ -5,6 +5,9 @@
 
   <package id="expat" version="2.1.0.11" />
 
+  <package id="libiconv" version="1.14.0.11" />
+  <package id="libiconv.redist" version="1.14.0.11" />
+
   <package id="libssh2" version="1.4.3.3" />
   <package id="libssh2.redist" version="1.4.3.3" />
 
diff --git a/config.mak.uname b/config.mak.uname
index 57291b8635..b891efbade 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -368,8 +368,7 @@ ifeq ($(uname_S),Windows)
 	NO_STRCASESTR = YesPlease
 	NO_STRLCPY = YesPlease
 	NO_MEMMEM = YesPlease
-	# NEEDS_LIBICONV = YesPlease
-	NO_ICONV = YesPlease
+	NEEDS_LIBICONV = YesPlease
 	NO_STRTOUMAX = YesPlease
 	NO_MKDTEMP = YesPlease
 	# VS2015 with UCRT claims that snprintf and friends are C99 compliant,