diff --git a/g10/ChangeLog b/g10/ChangeLog
index 2221b6341..9c218a51d 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -7,7 +7,8 @@
 	fingerprint when checking a signature with --always-trust enabled.
 
 	* filter.h (progress_filter_context_t), progress.c
-	(handle_progress): Fix compiler warnings.  Make "what" constant.
+	(handle_progress), plaintext.c (ask_for_detached_datafile,
+	hash_datafiles): Fix compiler warnings.  Make "what" constant.
 
 	* build-packet.c (do_plaintext): Do not create invalid literal
 	packets with >255-byte names.
diff --git a/g10/plaintext.c b/g10/plaintext.c
index b6a813c37..2567a7613 100644
--- a/g10/plaintext.c
+++ b/g10/plaintext.c
@@ -371,7 +371,7 @@ ask_for_detached_datafile( MD_HANDLE md, MD_HANDLE md2,
     do_hash( md, md2, fp, textmode );
     iobuf_close(fp);
     if (dealloc_pfx_name)
-      m_free (pfx.what);
+      m_free ((void *)pfx.what);
 
   leave:
     m_free(answer);
@@ -398,7 +398,7 @@ hash_datafiles( MD_HANDLE md, MD_HANDLE md2, STRLIST files,
 	if( fp ) {
 	    do_hash( md, md2, fp, textmode );
 	    iobuf_close(fp);
-	    m_free (pfx.what);
+	    m_free ((void *)pfx.what);
 	    return 0;
 	}
         log_error (_("no signed data\n"));