diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d0c4473c01b39a306b7bd8465654ca6049131407..065feb15f7efbf6e63d82107160f3bae0f64ab60 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-24  Frank Ch. Eigler  <fche@redhat.com>
+
+	* tree-mudflap.c (mx_register_decls): Add third (type) argument
+	to synthesized __mf_unregister call.
+
 2004-06-24  Roger Sayle  <roger@eyesopen.com>
 
 	PR middle-end/15239
diff --git a/gcc/tree-mudflap.c b/gcc/tree-mudflap.c
index 6181bb6ab13ad3f3cca282a3848a04490b06dd9e..4d9e77b490e30e4b46636582524a6274863101ab 100644
--- a/gcc/tree-mudflap.c
+++ b/gcc/tree-mudflap.c
@@ -883,19 +883,23 @@ mx_register_decls (tree decl, tree *stmt_list)
               size = convert (size_type_node, TYPE_SIZE_UNIT (TREE_TYPE (decl)));
             }
 
-          /* (& VARIABLE, sizeof (VARIABLE)) */
+          /* (& VARIABLE, sizeof (VARIABLE), __MF_TYPE_STACK) */
           unregister_fncall_params =
             tree_cons (NULL_TREE,
                        convert (ptr_type_node,
                                 mf_mark (build1 (ADDR_EXPR,
                                                  build_pointer_type (TREE_TYPE (decl)),
                                                  decl))),
-                       tree_cons (NULL_TREE, size, NULL_TREE));
+                       tree_cons (NULL_TREE, 
+                                  size,
+                                  tree_cons (NULL_TREE, 
+                                             build_int_2 (3, 0), /* __MF_TYPE_STACK */
+                                             NULL_TREE)));
           /* __mf_unregister (...) */
           unregister_fncall = build_function_call_expr (mf_unregister_fndecl,
                                                         unregister_fncall_params);
 
-          /* (& VARIABLE, sizeof (VARIABLE), __MF_TYPE_STACK) */
+          /* (& VARIABLE, sizeof (VARIABLE), __MF_TYPE_STACK, "name") */
           variable_name = mf_varname_tree (decl);
           register_fncall_params =
             tree_cons (NULL_TREE,