diff --git a/ChangeLog b/ChangeLog
index df8b2bafd..0b469e220 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-15  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * scitilla/LexHTML.cxx:
+   Backport a change from Scintilla CVS to fix wrong folding of comments
+   in HTML/XML lexer (Scintilla #2532774, thanks to Jason Oster).
+
+
 2009-02-14  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * doc/plugins.dox:
diff --git a/scintilla/LexHTML.cxx b/scintilla/LexHTML.cxx
index 6d16c53f9..e3c2b4d0f 100644
--- a/scintilla/LexHTML.cxx
+++ b/scintilla/LexHTML.cxx
@@ -855,7 +855,7 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
 				state = SCE_H_SGML_COMMAND; // wait for a pending command
 			}
 			// fold whole tag (-- when closing the tag)
-			if (foldHTMLPreprocessor)
+			if (foldHTMLPreprocessor || (state == SCE_H_COMMENT))
 				levelCurrent++;
 			continue;
 		}