diff --git a/ChangeLog b/ChangeLog
index 2cdc8c00..c3e23500 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
    from document_save_file().
    Include missing error string in error message when writing the
    file failed.
+ * tagmanager/ctags.c:
+   Set ExecutableName to "geany" to prevent possible crashes on
+   Windows and maybe other systems.
 
 
 2008-04-25  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
diff --git a/tagmanager/ctags.c b/tagmanager/ctags.c
index 0d4ff22b..4afd59d4 100644
--- a/tagmanager/ctags.c
+++ b/tagmanager/ctags.c
@@ -219,7 +219,7 @@ char *CurrentDirectory = NULL;
 #ifdef HAVE_MKSTEMP
 static const char *ExecutableProgram = NULL;
 #endif
-static const char *ExecutableName = NULL;
+static const char *ExecutableName = "geany";
 static stringList* Excluded = NULL;
 
 static struct { long files, lines, bytes; } Totals = { 0, 0, 0 };