diff --git a/ChangeLog b/ChangeLog
index 0dbb78893..e8511355f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@
  * src/about.c: Updated copyright information.
  * geany_private.rc, README, src/*.c, src/*.h:
    Updated copyright information.
+ * data/filetype_extensions.conf, src/filetypes.c:
+   jsp is a Java extension.
 
 
 2007-01-14  Nick Treleaven  <nick.treleaven@btinternet.com>
diff --git a/data/filetype_extensions.conf b/data/filetype_extensions.conf
index a9adef43c..29d4658d4 100644
--- a/data/filetype_extensions.conf
+++ b/data/filetype_extensions.conf
@@ -5,14 +5,14 @@
 C=*.c;*.h;
 C++=*.cpp;*.cxx;*.c++;*.cc;*.h;*.hpp;*.hxx;*.h++;*.hh;*.C;
 D=*.d;*.di;
-Java=*.java;
+Java=*.java;*.jsp;
 Pascal=*.pas;*.pp;*.inc;*.dpr;*.dpk;
 ASM=*.asm;
 Fortran=*.f;*.for;*.ftn;*.f77;*.f90;*.f95;
 CAML=*.ml;*.mli;
 Perl=*.pl;*.perl;*.pm;*.agi;
 PHP=*.php;*.php3;*.php4;*.php5;*.phtml;
-Javascript=*.js;*.jsp;
+Javascript=*.js;
 Python=*.py;*.pyw;
 Ruby=*.rb;*.rhtml;
 Tcl=*.tcl;*.tk;*.wish;
diff --git a/src/filetypes.c b/src/filetypes.c
index 08d40fb38..81766f739 100644
--- a/src/filetypes.c
+++ b/src/filetypes.c
@@ -203,9 +203,10 @@ void filetypes_init_types()
 	filetypes[GEANY_FILETYPES_JAVA]->has_tags = TRUE;
 	filetypes[GEANY_FILETYPES_JAVA]->title = g_strdup(_("Java source file"));
 	filetypes[GEANY_FILETYPES_JAVA]->extension = g_strdup("java");
-	filetypes[GEANY_FILETYPES_JAVA]->pattern = g_new0(gchar*, 2);
+	filetypes[GEANY_FILETYPES_JAVA]->pattern = g_new0(gchar*, 3);
 	filetypes[GEANY_FILETYPES_JAVA]->pattern[0] = g_strdup("*.java");
-	filetypes[GEANY_FILETYPES_JAVA]->pattern[1] = NULL;
+	filetypes[GEANY_FILETYPES_JAVA]->pattern[1] = g_strdup("*.jsp");
+	filetypes[GEANY_FILETYPES_JAVA]->pattern[2] = NULL;
 	filetypes[GEANY_FILETYPES_JAVA]->comment_open = g_strdup("/*");
 	filetypes[GEANY_FILETYPES_JAVA]->comment_close = g_strdup("*/");
 	filetypes[GEANY_FILETYPES_JAVA]->style_func_ptr = styleset_java;
@@ -353,10 +354,9 @@ void filetypes_init_types()
 	filetypes[GEANY_FILETYPES_JS]->has_tags = TRUE;
 	filetypes[GEANY_FILETYPES_JS]->title = g_strdup(_("Javascript source file"));
 	filetypes[GEANY_FILETYPES_JS]->extension = g_strdup("js");
-	filetypes[GEANY_FILETYPES_JS]->pattern = g_new0(gchar*, 3);
+	filetypes[GEANY_FILETYPES_JS]->pattern = g_new0(gchar*, 2);
 	filetypes[GEANY_FILETYPES_JS]->pattern[0] = g_strdup("*.js");
-	filetypes[GEANY_FILETYPES_JS]->pattern[1] = g_strdup("*.jsp"); /// TODO what is jsp actually?
-	filetypes[GEANY_FILETYPES_JS]->pattern[2] = NULL;
+	filetypes[GEANY_FILETYPES_JS]->pattern[1] = NULL;
 	filetypes[GEANY_FILETYPES_JS]->style_func_ptr = styleset_js;
 	filetypes[GEANY_FILETYPES_JS]->comment_open = g_strdup("//");
 	filetypes[GEANY_FILETYPES_JS]->comment_close = NULL;