diff --git a/ChangeLog b/ChangeLog
index 959ccb1dcc..2ccd09bd8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2001-07-08  Ulrich Drepper  <drepper@redhat.com>
 
+	* iconv/iconv_prog.c (main): Don't unconditionally define
+	variables only use if _POSIX_MAPPED_FILES is defined.
+
 	* sysdeps/unix/sysv/aix/sendmsg.c (sendmsg): Fix return type.
 	* sysdeps/unix/sysv/aix/recvmsg.c (recvmsg): Likewise.
 
diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c
index 59e120fe3f..00b4b95672 100644
--- a/iconv/iconv_prog.c
+++ b/iconv/iconv_prog.c
@@ -246,8 +246,10 @@ main (int argc, char *argv[])
       else
 	do
 	  {
+#ifdef _POSIX_MAPPED_FILES
 	    struct stat st;
 	    char *addr;
+#endif
 	    int fd;
 
 	    if (verbose)