diff --git a/ChangeLog b/ChangeLog
index 3007a0f336..006ae6a28e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-09-12  Christopher Aillon  <caillon@redhat.com>
 
+	* src/gnome-keyring-md5.c: Updated code from gnome-keyring
+
 	* gnome/applet/applet-dbus-devices.c:
 	* gnome/applet/applet.c:
 	* gnome/applet/nm-device.c:
diff --git a/src/gnome-keyring-md5.c b/src/gnome-keyring-md5.c
index 4ea0729c14..0a3dd71dc0 100644
--- a/src/gnome-keyring-md5.c
+++ b/src/gnome-keyring-md5.c
@@ -29,7 +29,7 @@ gnome_keyring_md5_string (const char *string, unsigned char digest[16])
   struct GnomeKeyringMD5Context md5_context;
   
   gnome_keyring_md5_init (&md5_context);
-  gnome_keyring_md5_update (&md5_context, string, strlen (string));
+  gnome_keyring_md5_update (&md5_context, (const unsigned char *)string, strlen (string));
   gnome_keyring_md5_final (digest, &md5_context);
 }
 
@@ -58,7 +58,7 @@ char *
 gnome_keyring_md5_digest_to_ascii (unsigned char digest[16])
 {
   static char hex_digits[] = "0123456789abcdef";
-  unsigned char *res;
+  char *res;
   int i;
   
   res = g_malloc (33);