diff --git a/libmudflap/ChangeLog b/libmudflap/ChangeLog
index 4b29756ebee..d4a0b73d1bf 100644
--- a/libmudflap/ChangeLog
+++ b/libmudflap/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-27  Ulrich Weigand  <weigand@informatik.uni-erlangen.de>
+
+	* mf-runtime.c (__mf_fini): Set mudflap_mode to mode_nop in
+	the statically linked case.
+
 2004-07-27  Frank Ch. Eigler  <fche@redhat.com>
 
 	* splay-tree.[ch]: Remove.  Merge contents into ...
diff --git a/libmudflap/mf-runtime.c b/libmudflap/mf-runtime.c
index 176898830e1..e0a37a437dc 100644
--- a/libmudflap/mf-runtime.c
+++ b/libmudflap/mf-runtime.c
@@ -778,6 +778,12 @@ void __mf_fini ()
 {
   TRACE ("__mf_fini\n");
   __mfu_report ();
+
+#ifndef PIC
+/* Since we didn't populate the tree for allocations in constructors
+   before __mf_init, we cannot check destructors after __mf_fini.  */
+  __mf_opts.mudflap_mode = mode_nop;
+#endif
 }