diff --git a/src/ChangeLog b/src/ChangeLog
index 657f3f6c3..f5dc9b85a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2001-07-15  Pavel Roskin  <proski@gnu.org>
 
+	* mad.h: Include stdio.h to prevent redefining mad_tempnam().
+	* main.c [HAVE_X && HAVE_MAD]: Don't call done_key().
+
 	* dlg.h: Remove declarations of non-existent functions.
 	[HAVE_X]: Disable color constants - they shouldn't be used.
 
diff --git a/src/mad.h b/src/mad.h
index 8706aba8c..8ab1063fb 100644
--- a/src/mad.h
+++ b/src/mad.h
@@ -2,6 +2,7 @@
 #define __MAD_H
 
 /* To prevent molesting these files with the malloc/calloc/free macros.  */
+#include <stdio.h>
 #include <stdlib.h>
 #if !defined(STDC_HEADERS) && defined(HAVE_MALLOC_H)
 #   include <malloc.h>
diff --git a/src/main.c b/src/main.c
index fc063dd26..13b39791f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3222,7 +3222,7 @@ main (int argc, char *argv [])
 	g_free (last_wd_string);
     }
 
-#ifdef HAVE_MAD
+#if defined(HAVE_MAD) && !defined(HAVE_X)
     done_key ();
 #endif