diff --git a/sm/ChangeLog b/sm/ChangeLog
index 5e86589a9..a4807bf20 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-21  Werner Koch  <wk@g10code.com>
+
+	* gpgsm.c: Comment mtrace feature.
+
 2006-12-21  Marcus Brinkmann  <marcus@g10code.de>
 
 	* certchain.c (gpgsm_basic_cert_check): Release SUBJECT.
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 4ad0ccff3..35dc921e7 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -28,7 +28,7 @@
 #include <ctype.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <mcheck.h>
+/*#include <mcheck.h>*/
 
 #include "gpgsm.h"
 #include <gcrypt.h>
@@ -744,7 +744,7 @@ main ( int argc, char **argv)
   certlist_t signerlist = NULL;
   int do_not_setup_keys = 0;
 
-  mtrace();
+  /*mtrace();*/
 
   /* trap_unaligned ();*/
   set_strusage (my_strusage);