diff --git a/CHANGES.txt b/CHANGES.txt
index 79d205f..716ab53 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,6 +14,11 @@ Changelog
 - Updated Spanish translation.
   [hvelarde]
 
+- Fix that catalog rebuild breaks the path attribute on comments. This fixes
+  http://dev.plone.org/ticket/12437.
+  [pjstevns]
+
+
 2.1.1 (2011-11-24)
 ------------------
 
diff --git a/plone/app/discussion/tests/test_catalog.py b/plone/app/discussion/tests/test_catalog.py
index 5b48f76..0b3e94b 100644
--- a/plone/app/discussion/tests/test_catalog.py
+++ b/plone/app/discussion/tests/test_catalog.py
@@ -348,6 +348,9 @@ class CommentCatalogTest(unittest.TestCase):
         self.assertTrue(brains)
         comment_brain = brains[0]
         self.assertEqual(comment_brain.Title, u'Jim on Document 1')
+        self.assertEqual(comment_brain.getPath(),
+            '/plone/doc1/++conversation++default/' +
+            str(self.comment_id))
 
     def test_clear_and_rebuild_catalog_for_nested_comments(self):