diff --git a/ChangeLog b/ChangeLog
index c549993f..458a9720 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
    Redraw instead of scrolling in ScintillaGTK::ScrollText if there is
    an existing update region.
    Revert earlier ScintillaGTK::ExposeTextThis change.
+ * tagmanager/c.c:
+   Fix wrong D function return type after a class definition.
 
 
 2007-02-13  Nick Treleaven  <nick.treleaven@btinternet.com>
diff --git a/tagmanager/c.c b/tagmanager/c.c
index c340d483..8790e9a0 100644
--- a/tagmanager/c.c
+++ b/tagmanager/c.c
@@ -2309,11 +2309,15 @@ static boolean isStatementEnd (const statementInfo *const st)
     boolean isEnd;
 
     if (isType (token, TOKEN_SEMICOLON))
-	isEnd = TRUE;
+		isEnd = TRUE;
     else if (isType (token, TOKEN_BRACE_CLOSE))
-	isEnd = (boolean) (isLanguage (Lang_java) || ! isContextualStatement (st));
+		/* Java, D, C# do not require semicolons to end a block. Neither do C++
+		 * namespaces. All other blocks require a semicolon to terminate them.
+		 */
+		isEnd = (boolean) (isLanguage (Lang_java) || isLanguage (Lang_d) ||
+				! isContextualStatement (st));
     else
-	isEnd = FALSE;
+		isEnd = FALSE;
 
     return isEnd;
 }