diff --git a/ChangeLog b/ChangeLog
index 835d1d9ae7..b4ccb45d2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
+2000-07-16  Ulrich Drepper  <drepper@redhat.com>
+
+	* crypt/md5-crypt.c (__md5_crypt_r): Add casts for first
+	parameters of memset calls to avoid warnings.
+
 2000-07-15  Ulrich Drepper  <drepper@redhat.com>
 
+	* stdlib/Makefile: Rewrite rules to avoid running isomac unless
+	necessary.
+
 	* sysdeps/unix/sysv/linux/getcwd.c: Correct last patch.
 	Patch by Greg McGary <greg@mcgary.org>.
 
@@ -10,7 +18,7 @@
 
 2000-07-15  Jakub Jelinek  <jakub@redhat.com>
 
-	* gconv_open (__gconv_open): Initialize whole __gconv_trans_data
+	* iconv/gconv_open (__gconv_open): Initialize whole __gconv_trans_data
 	structure.
 
 2000-07-13  Jakub Jelinek  <jakub@redhat.com>
diff --git a/crypt/md5-crypt.c b/crypt/md5-crypt.c
index 6340502193..c842be503c 100644
--- a/crypt/md5-crypt.c
+++ b/crypt/md5-crypt.c
@@ -226,9 +226,9 @@ __md5_crypt_r (key, salt, buffer, buflen)
   memset (&ctx, '\0', sizeof (ctx));
   memset (&alt_ctx, '\0', sizeof (alt_ctx));
   if (key_copied)
-    memset (key, '\0', key_len);
+    memset ((char *) key, '\0', key_len);
   if (salt_copied)
-    memset (salt, '\0', salt_len);
+    memset ((char *) salt, '\0', salt_len);
 
   return buffer;
 }