diff --git a/g10/ChangeLog b/g10/ChangeLog
index 88ec84a3e..61aa9998f 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-31  David Shaw  <dshaw@jabberwocky.com>
+
+	* keyedit.c (menu_clean_uids_from_key,
+	menu_clean_subkeys_from_key), trustdb.c (clean_uids_from_key,
+	clean_subkeys_from_key): Fix mingw32 build warnings.  Noted by Joe
+	Vender.
+
 2005-05-31  Werner Koch  <wk@g10code.com>
 
 	* keydb.h [!ENABLE_AGENT_SUPPORT]: Define dummy types.
diff --git a/g10/keyedit.c b/g10/keyedit.c
index e0e57826b..70c5c5b57 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -3196,7 +3196,7 @@ menu_clean_uids_from_key(KBNODE keyblock)
 	{
 	  if(node->pkt->pkttype==PKT_USER_ID && is_deleted_kbnode(node))
 	    {
-	      char *reason;
+	      const char *reason;
 	      char *user=utf8_to_native(node->pkt->pkt.user_id->name,
 					node->pkt->pkt.user_id->len,0);
 
@@ -3231,7 +3231,7 @@ menu_clean_subkeys_from_key(KBNODE keyblock)
 	{
 	  if(node->pkt->pkttype==PKT_PUBLIC_SUBKEY && is_deleted_kbnode(node))
 	    {
-	      char *reason;
+	      const char *reason;
 
 	      if(node->pkt->pkt.public_key->is_revoked)
 		reason=_("revoked");
diff --git a/g10/trustdb.c b/g10/trustdb.c
index 826f83bad..d0f6dd83b 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -1683,7 +1683,7 @@ clean_uids_from_key(KBNODE keyblock,int noisy)
 
 	      if(noisy)
 		{
-		  char *reason;
+		  const char *reason;
 		  char *user=utf8_to_native(uid->name,uid->len,0);
 
 		  if(uid->is_revoked)
@@ -1745,7 +1745,7 @@ clean_subkeys_from_key(KBNODE keyblock,int noisy)
 
 	      if(noisy)
 		{
-		  char *reason;
+		  const char *reason;
 
 		  if(pk->is_revoked)
 		    reason=_("revoked");