diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index b1bec375156..6e588c632d9 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-10  Daniel Franke  <franke.daniel@gmail.com>
+
+	PR fortran/40287
+	* iresolve.c (resolve_mask_arg): Disabled warning on conversion
+	to LOGICAL(1).
+
 2009-12-10  Daniel Franke  <franke.daniel@gmail.com>
 
 	PR fortran/41369
diff --git a/gcc/fortran/iresolve.c b/gcc/fortran/iresolve.c
index 7e8bdfb0cea..1f8f9bce713 100644
--- a/gcc/fortran/iresolve.c
+++ b/gcc/fortran/iresolve.c
@@ -106,7 +106,7 @@ resolve_mask_arg (gfc_expr *mask)
 	{
 	  ts.type = BT_LOGICAL;
 	  ts.kind = 1;
-	  gfc_convert_type (mask, &ts, 2);
+	  gfc_convert_type_warn (mask, &ts, 2, 0);
 	}
     }
 }