diff --git a/Gemfile b/Gemfile
index 0f3fa6d3..672b2f40 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ gem "psych", ">= 5.3.0" # 5.2.5 for Data serialization, 5.3.0 for TruffleRuby
 
 gem "irb"
 gem "rake"
-gem "rdoc"
+gem "rdoc", ">= 7.2.0"
 gem "test-unit"
 gem "test-unit-ruby-core", git: "https://github.com/ruby/test-unit-ruby-core"
 
diff --git a/rakelib/rdoc.rake b/rakelib/rdoc.rake
index 722902cd..b2b67b19 100644
--- a/rakelib/rdoc.rake
+++ b/rakelib/rdoc.rake
@@ -12,17 +12,6 @@ module RDoc::Generator
       end
     end
 
-    # See https://github.com/ruby/rdoc/pull/936
-    module FixSectionComments
-      def markup(text)
-        @store ||= @parent&.store
-        super
-      end
-      def description; markup comment end
-      def comment;     super || @comments&.first end
-      def parse(_comment_location = nil) super() end
-    end
-
     # render "[label] data" lists as tables.  adapted from "hanna-nouveau" gem.
     module LabelListTable
       def list_item_start(list_item, list_type)
@@ -51,10 +40,6 @@ class RDoc::AnyMethod
   prepend RDoc::Generator::NetIMAP::RemoveRedundantParens
 end
 
-class RDoc::Context::Section
-  prepend RDoc::Generator::NetIMAP::FixSectionComments
-end
-
 class RDoc::Markup::ToHtml
   LIST_TYPE_TO_HTML[:NOTE] = ['<table class="rdoc-list note-list"><tbody>', '</tbody></table>']
   prepend RDoc::Generator::NetIMAP::LabelListTable