diff --git a/ChangeLog b/ChangeLog
index 8e40664776..344751f463 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
+1999-08-16  Ulrich Drepper  <drepper@cygnus.com>
+
+	* wcsmbs/wcsmbsload.c (__wcsmbs_clone_conv): Call
+	update_conversion_ptrs.
+	Reported by Shinya Hanataka <hanataka@abyss.rim.or.jp>.
+
 1999-08-15  Ulrich Drepper  <drepper@cygnus.com>
 
-	* wcsmbs/wcsnlen.c: Correct decrement maxlen.
+	* wcsmbs/wcsnlen.c: Correct decrement of maxlen.
+	Reported by Shinya Hanataka <hanataka@abyss.rim.or.jp>.
 
 	* wcsmbs/Makefile (tests): Add tst-wcsnlen.
 	* wcsmbs/tst-wcsnlen.c: New file.
diff --git a/wcsmbs/wcsmbsload.c b/wcsmbs/wcsmbsload.c
index b02acad68d..19ce7e7093 100644
--- a/wcsmbs/wcsmbsload.c
+++ b/wcsmbs/wcsmbsload.c
@@ -239,6 +239,9 @@ void
 internal_function
 __wcsmbs_clone_conv (struct gconv_fcts *copy)
 {
+  /* First make sure the function table is up-to-date.  */
+  update_conversion_ptrs ();
+
   /* Make sure the data structures remain the same until we are finished.  */
   __libc_lock_lock (lock);