diff --git a/ChangeLog b/ChangeLog
index 3694faff..9190cb1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
    Add reStructuredText filetype and parser.
  * src/filetypes.c, src/filetypes.h:
    Sort filetype groups alphabetically.
+ * src/keyfile.c, src/filetypes.c, data/filetype_extensions.conf:
+   Add comment about generating filetype_extensions.conf.
+   Update filetype_extensions.conf.
 
 
 2007-08-13  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
diff --git a/data/filetype_extensions.conf b/data/filetype_extensions.conf
index a199c73b..45c10c30 100644
--- a/data/filetype_extensions.conf
+++ b/data/filetype_extensions.conf
@@ -1,36 +1,39 @@
+#*** This file generated by: geany --generate-data-files ***
 #Filetype extension configuration file for Geany
 #Insert as many items as you want, seperate them with a ";".
 #See Geany's main documentation for details.
 [Extensions]
+ASM=*.asm;
 C=*.c;*.h;
 C++=*.cpp;*.cxx;*.c++;*.cc;*.h;*.hpp;*.hxx;*.h++;*.hh;*.C;
 C#=*.cs;*.lala;
+CAML=*.ml;*.mli;
 D=*.d;*.di;
+Fortran=*.f;*.for;*.ftn;*.f77;*.f90;*.f95;
+FreeBasic=*.bas;*.bi;
+Haskell=*.hs;*.lhs;
+Haxe=*.hx;
 Java=*.java;*.jsp;
 Pascal=*.pas;*.pp;*.inc;*.dpr;*.dpk;
-FreeBasic=*.bas;*.bi;
-ASM=*.asm;
-Fortran=*.f;*.for;*.ftn;*.f77;*.f90;*.f95;
-CAML=*.ml;*.mli;
+VHDL=*.vhd;*.vhdl;
+Ferite=*.fe;
+Javascript=*.js;
+Lua=*.lua;
+Make=*.mak;*.mk;GNUmakefile;makefile;Makefile;makefile.*;Makefile.*;
+O-Matrix=*.oms;
 Perl=*.pl;*.perl;*.pm;*.agi;*.pod;
 PHP=*.php;*.php3;*.php4;*.php5;*.phtml;
-Javascript=*.js;
 Python=*.py;*.pyw;
 Ruby=*.rb;*.rhtml;*.ruby;
-Tcl=*.tcl;*.tk;*.wish;
-Lua=*.lua;
-Ferite=*.fe;
 Sh=*.sh;configure;configure.in;configure.in.in;configure.ac;*.ksh;*.zsh;*.ash;*.bash;
-Make=*.mak;*.mk;GNUmakefile;makefile;Makefile;makefile.*;Makefile.*;
-XML=*.xml;*.sgml;*.xsl;*.xslt;*.xsd;
+Tcl=*.tcl;*.tk;*.wish;
+CSS=*.css;
 Docbook=*.docbook;
 HTML=*.htm;*.html;*.shtml;*.hta;*.htd;*.htt;*.cfm;
-CSS=*.css;
-SQL=*.sql;
-LaTeX=*.tex;*.sty;*.idx;
-O-Matrix=*.oms;
-VHDL=*.vhd;*.vhdl;
-Diff=*.diff;*.patch;*.rej;
+XML=*.xml;*.sgml;*.xsl;*.xslt;*.xsd;
 Conf=*.conf;*.ini;config;*rc;*.cfg;
-Haxe=*.hx;
+Diff=*.diff;*.patch;*.rej;
+LaTeX=*.tex;*.sty;*.idx;
+reStructuredText=*.rest;*.reST;
+SQL=*.sql;
 None=*;
diff --git a/src/filetypes.c b/src/filetypes.c
index c3a8fdeb..39174410 100644
--- a/src/filetypes.c
+++ b/src/filetypes.c
@@ -174,7 +174,7 @@ void filetypes_init_types()
 	filetypes[GEANY_FILETYPES_CS]->name = g_strdup("C#");
 	filetypes[GEANY_FILETYPES_CS]->title = g_strdup(_("C# source file"));
 	filetypes[GEANY_FILETYPES_CS]->extension = g_strdup("cs");
-	filetypes[GEANY_FILETYPES_CS]->pattern = utils_strv_new("*.cs", NULL);
+	filetypes[GEANY_FILETYPES_CS]->pattern = utils_strv_new("*.cs", "*.lala", NULL);
 	filetypes[GEANY_FILETYPES_CS]->style_func_ptr = styleset_cs;
 	filetypes[GEANY_FILETYPES_CS]->comment_open = g_strdup("//");
 	filetypes[GEANY_FILETYPES_CS]->comment_close = NULL;
diff --git a/src/keyfile.c b/src/keyfile.c
index 481203d6..88f8f137 100644
--- a/src/keyfile.c
+++ b/src/keyfile.c
@@ -725,6 +725,8 @@ static void generate_filetype_extensions(const gchar *output_dir)
 	GKeyFile *config;
 
 	config = g_key_file_new();
+	g_key_file_set_comment(config, NULL, NULL,
+		"*** This file generated by: geany --generate-data-files ***", NULL);
 	// add filetype keys
 	for (i = 0; i < GEANY_MAX_FILE_TYPES; i++)
 	{