diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index f563c146e30..267cdd56149 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-28  Tobias Burnus  <burnus@net-b.de>
+
+	* options.c (gfc_handle_option): Fix handling of -fno-whole-file.
+
 2010-05-28  Joseph Myers  <joseph@codesourcery.com>
 
 	* gfortranspec.c (append_arg, lang_specific_driver): Use
diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c
index f8d600b4692..6c6ccb10461 100644
--- a/gcc/fortran/options.c
+++ b/gcc/fortran/options.c
@@ -719,7 +719,7 @@ gfc_handle_option (size_t scode, const char *arg, int value,
       break;
 
     case OPT_fwhole_file:
-      gfc_option.flag_whole_file = 1;
+      gfc_option.flag_whole_file = value;
       break;
 
     case OPT_fsecond_underscore: