diff --git a/ChangeLog b/ChangeLog
index 407346c4..8574735d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-20  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * scintilla/KeyWords.cxx:
+   Link Octave instead of Matlab.
+   Add comment about not being autogenerated.
+   Minor changes to fit Scintilla order.
+
+
 2010-08-17  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * src/highlighting.c, src/editor.c:
diff --git a/scintilla/KeyWords.cxx b/scintilla/KeyWords.cxx
index e313e522..b3f7aec1 100644
--- a/scintilla/KeyWords.cxx
+++ b/scintilla/KeyWords.cxx
@@ -327,7 +327,8 @@ int Scintilla_LinkLexers() {
 
 //++Autogenerated -- run src/LexGen.py to regenerate
 //**\(\tLINK_LEXER(\*);\n\)
-LINK_LEXER(lmAda);
+// Not autogenerated for Geany ;-)
+	LINK_LEXER(lmAda);
 	LINK_LEXER(lmAsm);
 	LINK_LEXER(lmBash);
 	LINK_LEXER(lmCaml);
@@ -345,9 +346,10 @@ LINK_LEXER(lmAda);
 	LINK_LEXER(lmLua);
 	LINK_LEXER(lmMake);
 	LINK_LEXER(lmMarkdown);
-	LINK_LEXER(lmMatlab);
+	// We use Octave instead of Matlab
 	LINK_LEXER(lmNsis);
 	LINK_LEXER(lmNull);
+	LINK_LEXER(lmOctave);
 	LINK_LEXER(lmPascal);
 	LINK_LEXER(lmPerl);
 	LINK_LEXER(lmPo);
@@ -357,8 +359,8 @@ LINK_LEXER(lmAda);
 	LINK_LEXER(lmRuby);
 	LINK_LEXER(lmSQL);
 	LINK_LEXER(lmTCL);
-	LINK_LEXER(lmVHDL);
 	LINK_LEXER(lmVerilog);
+	LINK_LEXER(lmVHDL);
 	LINK_LEXER(lmXML);
 	LINK_LEXER(lmYAML);