diff --git a/lib/rdoc/generator/template/aliki/class.rhtml b/lib/rdoc/generator/template/aliki/class.rhtml
index c6e3164eaa..d402276d78 100644
--- a/lib/rdoc/generator/template/aliki/class.rhtml
+++ b/lib/rdoc/generator/template/aliki/class.rhtml
@@ -59,7 +59,11 @@
     <%- unless constants.empty? %>
     <section class="constants-list">
       <header>
+        <%- if section.title %>
         <h3 id="<%= section.aref %>-constants"><a href="#<%= section.aref %>-constants">Constants</a></h3>
+        <%- else %>
+        <h2 id="<%= section.aref %>-constants"><a href="#<%= section.aref %>-constants">Constants</a></h2>
+        <%- end %>
       </header>
       <dl>
       <%- constants.each do |const| %>
@@ -84,7 +88,11 @@
     <%- unless attributes.empty? %>
     <section class="attribute-method-details method-section">
       <header>
+        <%- if section.title %>
         <h3 id="<%= section.aref %>-attributes"><a href="#<%= section.aref %>-attributes">Attributes</a></h3>
+        <%- else %>
+        <h2 id="<%= section.aref %>-attributes"><a href="#<%= section.aref %>-attributes">Attributes</a></h2>
+        <%- end %>
       </header>
 
       <%- attributes.each do |attrib| %>
@@ -122,7 +130,11 @@
     <%- next if methods.empty? %>
      <section id="<%= visibility %>-<%= type %>-<%= section.aref %>-method-details" class="method-section anchor-link">
        <header>
+         <%- if section.title %>
          <h3 id="<%= visibility %>-<%= type %>-<%= section.aref %>-methods"><a href="#<%= visibility %>-<%= type %>-<%= section.aref %>-methods"><%= visibility.to_s.capitalize %> <%= type.capitalize %> Methods</a></h3>
+         <%- else %>
+         <h2 id="<%= visibility %>-<%= type %>-<%= section.aref %>-methods"><a href="#<%= visibility %>-<%= type %>-<%= section.aref %>-methods"><%= visibility.to_s.capitalize %> <%= type.capitalize %> Methods</a></h2>
+         <%- end %>
        </header>
 
     <%- methods.each do |method| %>
diff --git a/test/rdoc/generator/aliki_test.rb b/test/rdoc/generator/aliki_test.rb
index 068fb92ebf..99ff528c9e 100644
--- a/test/rdoc/generator/aliki_test.rb
+++ b/test/rdoc/generator/aliki_test.rb
@@ -78,6 +78,28 @@ def test_aliased_classes_full_name
     assert_equal(%w[Klass Klass::A Object], @g.classes.map(&:full_name).sort)
   end
 
+  def test_class_section_heading_levels
+    @klass.add_constant RDoc::Constant.new('DEFAULT', '1', '')
+    @klass.add_attribute RDoc::Attr.new('default_attr', 'R', '')
+
+    @klass.set_current_section 'Utilities', nil
+    @klass.add_constant RDoc::Constant.new('NAMED', '2', '')
+    @klass.add_attribute RDoc::Attr.new('named_attr', 'R', '')
+    @klass.add_method RDoc::AnyMethod.new('named_method')
+
+    @g.generate
+
+    content = File.binread('Klass.html')
+
+    assert_include content, '<h2 id="untitled-constants">'
+    assert_include content, '<h2 id="untitled-attributes">'
+    assert_include content, '<h2 id="public-instance-untitled-methods">'
+    assert_include content, '<h2 id="utilities">'
+    assert_include content, '<h3 id="utilities-constants">'
+    assert_include content, '<h3 id="utilities-attributes">'
+    assert_include content, '<h3 id="public-instance-utilities-methods">'
+  end
+
   def test_write_style_sheet_copies_css_and_js_only
     @g.generate