diff --git a/ChangeLog b/ChangeLog
index c795a5fc1c..f5afa30294 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-09-15  Ulrich Drepper  <drepper@redhat.com>
 
+	* iconvdata/tst-tables.sh: Add warning that GB18030 test might
+	take longer.
+
 	* math/complex.h: Don't define _Complex macro for gcc 3.  Add
 	__extension__ to _Complex_I definition since gcc warns if -pedantic.
 	* math/bits/cmathcalls.h (conj): Add __extension__ since we use ~.
diff --git a/iconvdata/tst-tables.sh b/iconvdata/tst-tables.sh
index 1ca5271503..bc7706b1f5 100755
--- a/iconvdata/tst-tables.sh
+++ b/iconvdata/tst-tables.sh
@@ -201,9 +201,11 @@ cat <<EOF |
   #ISO-2022-JP-2
   #ISO-2022-KR
   #ISO-2022-CN
+  #ISO-2022-CN-EXT
   #
 EOF
 while read charset charmap; do
+  if test "$charset" = GB18030; then echo "This might take a while" 1>&2; fi
   case ${charset} in \#*) continue;; esac
   echo -n "Testing ${charset}" 1>&2
   if ./tst-table.sh ${common_objpfx} ${objpfx} ${charset} ${charmap}; then