diff --git a/ChangeLog b/ChangeLog
index 39cd3c99..0df3a43a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-03  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * tagmanager/fortran.c, src/symbols.c:
+   Adjust available symbol types between Fortran parser and symbols.c to
+   make some more of the possbile symbol types available.
+
+
 2008-02-28  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * src/utils.c, src/utils.h, tagmanager/parse.h:
diff --git a/src/symbols.c b/src/symbols.c
index aa4b2424..12b78659 100644
--- a/src/symbols.c
+++ b/src/symbols.c
@@ -704,6 +704,20 @@ static void init_tag_list(gint idx)
 				NULL);
 			break;
 		}
+		case GEANY_FILETYPES_FORTRAN:
+		{
+			tag_list_add_groups(tag_store,
+				&(tv_iters.tag_namespace), _("Module"), NULL,
+				&(tv_iters.tag_struct), _("Interfaces"), "classviewer-struct",
+				&(tv_iters.tag_function), _("Functions"), "classviewer-method",
+				&(tv_iters.tag_member), _("Subroutines"), "classviewer-method",
+				&(tv_iters.tag_variable), _("Variables"), "classviewer-var",
+				&(tv_iters.tag_type), _("Types"), "classviewer-namespace",
+				&(tv_iters.tag_macro), _("Blocks"), "classviewer-member",
+				&(tv_iters.tag_other), _("Other"), "classviewer-other",
+				NULL);
+			break;
+		}
 		case GEANY_FILETYPES_D:
 		default:
 		{
diff --git a/tagmanager/fortran.c b/tagmanager/fortran.c
index b6a04ca8..10c3f640 100644
--- a/tagmanager/fortran.c
+++ b/tagmanager/fortran.c
@@ -171,17 +171,17 @@ static tokenInfo *Parent = NULL;
 /* indexed by tagType */
 static kindOption FortranKinds [] = {
     { TRUE,  'b', "block data", "block data"},
-    { TRUE,  'c', "common",     "common blocks"},
+    { TRUE,  'c', "macro",      "common blocks"},
     { TRUE,  'e', "entry",      "entry points"},
     { TRUE,  'f', "function",   "functions"},
-    { TRUE,  'i', "interface",  "interfaces"},
+    { TRUE,  'i', "struct",     "interfaces"},
     { TRUE,  'k', "component",  "type components"},
     { TRUE,  'l', "label",      "labels"},
     { FALSE, 'L', "local",      "local and common block variables"},
-    { TRUE,  'm', "module",     "modules"},
+    { TRUE,  'm', "namespace",  "modules"},
     { TRUE,  'n', "namelist",   "namelists"},
-    { TRUE,  'p', "program",    "programs"},
-    { TRUE,  's', "subroutine", "subroutines"},
+    { TRUE,  'p', "package",    "programs"},
+    { TRUE,  's', "member",     "subroutines"},
     { TRUE,  't', "type",       "derived types"},
     { TRUE,  'v', "variable",   "module variables"}
 };