diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 54958f738e2..1aa75d6d517 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-10  Daniel Franke  <franke.daniel@gmail.com>
+
+	fortran/PR35019
+	* lang.opt: Allow '-J<dir>' next to '-J <dir>', 
+	likewise '-I <dir>' and '-I<dir>'.
+
 2008-02-06  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	PR other/35107
diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt
index 55e8b516028..bc48e78bd3a 100644
--- a/gcc/fortran/lang.opt
+++ b/gcc/fortran/lang.opt
@@ -25,11 +25,11 @@ Language
 Fortran
 
 I
-Fortran Joined
+Fortran Joined Separate
 -I<directory>	Add a directory for INCLUDE and MODULE searching
 
 J
-Fortran Joined
+Fortran Joined Separate
 -J<directory>	Put MODULE files in 'directory'
 
 Wall