Index: win32/make.msc
===================================================================
--- win32/make.msc	(revision 451)
+++ win32/make.msc	(working copy)
@@ -92,10 +92,10 @@
 LIBART_LIBS = $(LIBART)\libart.lib
 
 INTL_CFLAGS = -I $(INTL)
-INTL_LIBS = $(INTL)\intl.lib 
+INTL_LIBS = $(INTL)\lib\libintl.lib
 
 LIBICONV_CFLAGS = -I $(LIBICONV)\include
-LIBICONV_LIBS = $(LIBICONV)\lib\iconv.lib
+LIBICONV_LIBS = $(LIBICONV)\lib\libiconv.lib
 
 LIBXML_CFLAGS = -I $(LIBXML)
 LIBXML_LIBS = $(LIBXML)\xml-$(LIBXML_VER).lib
Index: win32/module.defs
===================================================================
--- win32/module.defs	(revision 451)
+++ win32/module.defs	(working copy)
@@ -39,7 +39,7 @@
 GTKGLAREA_VER = 1.2.2
 GTK2_VER = 2.0
 LIBGLADE_VER = 0.14
-LIBICONV_VER = 1.7
+LIBICONV_VER = 1.9.2-1
 LIBXML_VER = 1.8.7
 LIBXML2_VER = 2.4.2
 PANGO_VER = 1.0
@@ -91,10 +91,10 @@
 FREETYPE2 = $(TOP)/freetype2
 GTKEXTRA = $(TOP)/gtk+extra
 GTKGLAREA = $(TOP)/gtkglarea
-INTL = $(TOP)/gettext-0.10.40/intl
+INTL = $(TOP)/gettext
 JPEG = $(TOP)/jpeg-6b
 LIBART = $(TOP)/libart_lgpl
-LIBICONV = $(TOP)/libiconv-$(LIBICONV_VER)
+LIBICONV = $(TOP)/libiconv
 LIBXSLT = $(TOP)/libxslt
 PNG = $(TOP)/libpng-1.2.0
 RSVG = $(TOP)\librsvg