diff --git a/ChangeLog b/ChangeLog
index 85eba7a8f..1603a213d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
 
  * src/dialogs.c: Fix dialog path warnings for command-line files.
  * src/callbacks.c: Fix Go to tag declaration/definition.
+ * tagmanager/docbook.c: Fix a segfault with missing id in element.
 
 
 2006-05-31  Nick Treleaven  <nick.treleaven@btinternet.com>
diff --git a/tagmanager/docbook.c b/tagmanager/docbook.c
index af8533513..e787a6389 100644
--- a/tagmanager/docbook.c
+++ b/tagmanager/docbook.c
@@ -68,6 +68,7 @@ static void createTag(docbookKind kind, const char *buf)
 	if (*buf == '>') return;
 
 	buf = strstr(buf, "id=\"");
+	if (buf == NULL) return;
 	buf += 4;
 	if (*buf == '"') return;
 	name = vStringNew();