diff --git a/ChangeLog b/ChangeLog
index 779f917..d4609e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2007-12-08  Bruno Haible  <bruno@clisp.org>
+
+	* Version 1.11.1 released.
+
+2007-12-03  Bruno Haible  <bruno@clisp.org>
+
+	Portability fixes for MSVC.
+	* srclib/Makefile.msvc (CFLAGS): Define EXEEXT.
+	(OBJECTS): Add width.obj.
+	(width.obj): New rule.
+	* srclib/Makefile.vms (OBJECTS): Add width.obj.
+	(width.obj): New rule.
+	* windows/stdint.h: New file.
+	* windows/unistd.h: New file.
+	Reported by Milan Gornik <milan.gornik@dmsgroup.co.yu>.
+
 2006-07-19  Bruno Haible  <bruno@clisp.org>
 
 	* Version 1.11 released.
diff --git a/NEWS b/NEWS
index 0f1609a..222e8d8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+New in 1.11.1:
+* Portability fixes for the MSVC platform.
+
 New in 1.11:
 * The iconv program has new options --unicode-subst, --byte-subst,
   --widechar-subst that allow to specify substitutions for characters that
diff --git a/README b/README
index 3ddcddd..38dee74 100644
--- a/README
+++ b/README
@@ -141,7 +141,7 @@
 
 
 Download:
-    ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.11.tar.gz
+    ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.11.1.tar.gz
 
 Homepage:
     http://www.gnu.org/software/libiconv/
diff --git a/srclib/Makefile.msvc b/srclib/Makefile.msvc
index be35fc6..600fea3 100644
--- a/srclib/Makefile.msvc
+++ b/srclib/Makefile.msvc
@@ -64,7 +64,7 @@
 LIBINTL = $(libdir)\intl.lib
 !endif
 
-CFLAGS = $(MFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) -DHAVE_CONFIG_H $(NLSFLAGS) -DDEPENDS_ON_LIBICONV=1 -DDEPENDS_ON_LIBINTL=1
+CFLAGS = $(MFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) -DHAVE_CONFIG_H -DEXEEXT=\".exe\" $(NLSFLAGS) -DDEPENDS_ON_LIBICONV=1 -DDEPENDS_ON_LIBINTL=1
 
 INCLUDES = -I. -I.. -I..\windows $(INCINTL)
 
@@ -87,6 +87,7 @@
   allocsa.obj \
   error.obj \
   progname.obj progreloc.obj \
+  width.obj \
   xmalloc.obj xstrdup.obj \
   \
   relocatable.obj \
@@ -106,6 +107,9 @@
 progreloc.obj : progreloc.c
 	$(CC) $(INCLUDES) $(CFLAGS) -c progreloc.c
 
+width.obj : width.c
+	$(CC) $(INCLUDES) $(CFLAGS) -c width.c
+
 xmalloc.obj : xmalloc.c
 	$(CC) $(INCLUDES) $(CFLAGS) -c xmalloc.c
 
diff --git a/srclib/Makefile.vms b/srclib/Makefile.vms
index 3a820c9..0731819 100644
--- a/srclib/Makefile.vms
+++ b/srclib/Makefile.vms
@@ -42,6 +42,7 @@
   allocsa.obj, \
   error.obj, \
   progname.obj, progreloc.obj, \
+  width.obj, \
   xmalloc.obj, xstrdup.obj, \
   xreadlink.obj, \
   \
@@ -66,6 +67,9 @@
 progreloc.obj : progreloc.c
 	$(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) progreloc.c
 
+width.obj : width.c
+	$(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) width.c
+
 xmalloc.obj : xmalloc.c
 	$(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) xmalloc.c