diff --git a/Makefile b/Makefile
index 760b5448be..f45f0e6179 100644
--- a/Makefile
+++ b/Makefile
@@ -482,7 +482,8 @@ ifneq (,$(findstring MINGW,$(uname_S)))
 	NO_UNSETENV=YesPlease
 	NO_STRCASESTR=YesPlease
 	NO_STRLCPY=YesPlease
-	NO_ICONV=YesPlease
+	NEEDS_LIBICONV = YesPlease
+	OLD_ICONV = YesPlease
 	NO_C99_FORMAT = YesPlease
 	NO_STRTOUMAX = YesPlease
 	NO_SYMLINKS=YesPlease
diff --git a/README.MinGW b/README.MinGW
index c0b8f66b93..436d7b7849 100644
--- a/README.MinGW
+++ b/README.MinGW
@@ -28,7 +28,8 @@ In order to compile this code you need:
 	zlib-1.2.3-mingwPORT-1.tar
 	w32api-3.6.tar.gz
 	tcltk-8.4.1-1.exe (for gitk, git-gui)
-	libiconv-1.9.2-1-{lib,bin}.zip (for git-am, from http://gnuwin32.sourceforge.net/packages/libiconv.htm)
+	libiconv-1.9.2-1-{lib,bin,lib}.zip (for git-am,
+		from http://gnuwin32.sourceforge.net/packages/libiconv.htm)
 
 
 STATUS