diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index a738975aa31..54c8e896698 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-16  Tobias Burnus  <burnus@net-b.de>
+
+	* trans-decl.c (gfc_generate_function_code): Use all arguments of
+	  set_std.
+
 2007-03-15  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
 
 	* gfortran.h (gfc_option_t): Add flag_backtrace field.
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index a98b11ce5dd..f8be3df56c9 100644
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -3137,7 +3137,7 @@ gfc_generate_function_code (gfc_namespace * ns)
   if (sym->attr.is_main_program)
     {
       tree gfc_int4_type_node = gfc_get_int_type (4);
-      tmp = build_call_expr (gfor_fndecl_set_std, 3,
+      tmp = build_call_expr (gfor_fndecl_set_std, 5,
 			     build_int_cst (gfc_int4_type_node,
 					    gfc_option.warn_std),
 			     build_int_cst (gfc_int4_type_node,