diff --git a/CHANGES.txt b/CHANGES.txt
index 89c5ea8..9930e10 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,9 @@ Changelog
 2.0b1 (Unreleased)
 ------------------
 
+- Fixed RoleManager import to avoid deprecation warning on Zope 2.13.
+  [davisagli]
+
 - French translations.
   [thomasdesvenain]
 
@@ -15,6 +18,7 @@ Changelog
 
 2.0a3 (2011-03-02)
 ------------------
+
 - Fixed test failure for the default user portrait, which changed from
   defaultUser.gif to defaultUser.png in Products.PlonePAS 4.0.5
   [maurits]
diff --git a/plone/app/discussion/comment.py b/plone/app/discussion/comment.py
index 1082c88..4112efd 100644
--- a/plone/app/discussion/comment.py
+++ b/plone/app/discussion/comment.py
@@ -19,7 +19,6 @@ from zope.interface import implements
 
 from Acquisition import aq_parent, aq_base, Implicit
 
-from AccessControl.Role import RoleManager
 from OFS.owner import Owned
 
 from persistent import Persistent
@@ -41,6 +40,12 @@ from plone.app.discussion.interfaces import IDiscussionSettings
 from Products.CMFCore.CMFCatalogAware import CatalogAware
 from Products.CMFCore.CMFCatalogAware import WorkflowAware
 
+try:
+    from OFS.role import RoleManager
+except ImportError:
+    # Zope <=2.12
+    from AccessControl.Role import RoleManager
+
 
 COMMENT_TITLE = _(u"comment_title",
     default=u"${creator} on ${content}")