diff --git a/ChangeLog b/ChangeLog
index a762760f14..798a816eba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-02  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* iconvdata/bug-iconv8.c (do_test): Use %z for size_t arguments.
+	* iconvdata/bug-iconv9.c (do_test): Use %t for ptrdiff_t
+	arguments.
+
 2012-11-02  Roland McGrath  <roland@hack.frob.com>
 
 	* aclocal.m4 (GLIBC_AUTOCONF_VERSION): New macro.
diff --git a/iconvdata/bug-iconv8.c b/iconvdata/bug-iconv8.c
index 54c6be2f63..b91dc1d1f2 100644
--- a/iconvdata/bug-iconv8.c
+++ b/iconvdata/bug-iconv8.c
@@ -24,7 +24,7 @@ do_test (void)
    ret = iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
    iconv_close(cd);
 
-   printf("result: %ld %d %ld %d\n", ret, errno, inbytesleft, inbuf[0]);
+   printf("result: %zd %d %zd %d\n", ret, errno, inbytesleft, inbuf[0]);
 
    /*
     * result: -1 84 0 0        (84=EILSEQ)
diff --git a/iconvdata/bug-iconv9.c b/iconvdata/bug-iconv9.c
index e4ffd593e5..28f88d22e9 100644
--- a/iconvdata/bug-iconv9.c
+++ b/iconvdata/bug-iconv9.c
@@ -37,7 +37,7 @@ do_test (void)
     }
   if (in != inbuf + sizeof (inbuf) - 1)
     {
-      printf ("in advanced by %jd, expected %zu\n",
+      printf ("in advanced by %td, expected %zu\n",
 	      in - inbuf, sizeof (inbuf) - 1);
       res = 1;
     }