diff --git a/ChangeLog b/ChangeLog
index e5537169..0622f2c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,8 @@
    Make Ctrl-click working again to create rectangular selections when
    no braces and valid definitions are below the cursor (to whose would
    be jumped then).
+ * src/filetypes.c, data/filetypes.fortran:
+   Change comment character to '!' for Fortran 90 (closes #2438423).
 
 
 2008-12-16  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
diff --git a/data/filetypes.fortran b/data/filetypes.fortran
index 410abc06..7043e58b 100644
--- a/data/filetypes.fortran
+++ b/data/filetypes.fortran
@@ -34,7 +34,7 @@ user_functions=cdabs cdcos cdexp cdlog cdsin cdsqrt cotan cotand dcmplx dconjg d
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 
 # if only single comment char is supported like # in this file, leave comment_close blank
-comment_open=c
+comment_open=!
 comment_close=
 
 # set to false if a comment character/string should start at column 0 of a line, true uses any
diff --git a/src/filetypes.c b/src/filetypes.c
index f1f81400..db417501 100644
--- a/src/filetypes.c
+++ b/src/filetypes.c
@@ -187,7 +187,7 @@ static void init_builtin_filetypes(void)
 	ft->title = g_strdup_printf(_("%s source file"), "Fortran (F90)");
 	ft->extension = g_strdup("f90");
 	ft->pattern = utils_strv_new("*.f90", "*.f95", "*.f03", NULL);
-	ft->comment_open = g_strdup("c");
+	ft->comment_open = g_strdup("!");
 	ft->comment_close = NULL;
 	ft->group = GEANY_FILETYPE_GROUP_COMPILED;