diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60407e155dc..b4091ebf961 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,9 +46,11 @@ You can read more about this in the decision record at `adr/2023-04-libxml-memor
 * [CRuby] The C extension now uses Ruby's [TypedData API](https://docs.ruby-lang.org/en/3.0/extension_rdoc.html#label-Encapsulate+C+Data+into+a+Ruby+Object) for managing all the libxml2 structs. Write barriers may improve GC performance in some extreme cases. [[#2808](https://github.com/sparklemotion/nokogiri/issues/2808)] (Thanks, [@etiennebarrie](https://github.com/etiennebarrie) and [@byroot](https://github.com/byroot)!)
 * [CRuby] `ObjectSpace.memsize_of` reports a pretty good guess of memory usage when called on `Nokogiri::XML::Document` objects. [[#2807](https://github.com/sparklemotion/nokogiri/issues/2807)] (Thanks, [@etiennebarrie](https://github.com/etiennebarrie) and [@byroot](https://github.com/byroot)!)
 * [CRuby] Users installing the "ruby" platform gem and compiling libxml2 and libxslt from source will now be using a modern `config.guess` and `config.sub` that supports new architectures like `loongarch64`. [[#2831](https://github.com/sparklemotion/nokogiri/issues/2831)] (Thanks, [@zhangwenlong8911](https://github.com/zhangwenlong8911)!)
-* [CRuby] HTML5 parser now adjusts the specified attributes, adding `xlink:arcrole` and removing `xml:base` [[#2841](https://github.com/sparklemotion/nokogiri/issues/2841), [#2842](https://github.com/sparklemotion/nokogiri/issues/2842)]
 * [JRuby] `Node#first_element_child` now returns `nil` if there are only non-element children. [[#2808](https://github.com/sparklemotion/nokogiri/issues/2808), [#2844](https://github.com/sparklemotion/nokogiri/issues/2844)]
 * Documentation for `Nokogiri::XSLT` now has usage examples including custom function handlers.
+* [CRuby] HTML5 parser:
+  * adjusts the specified attributes, adding `xlink:arcrole` and removing `xml:base` [[#2841](https://github.com/sparklemotion/nokogiri/issues/2841), [#2842](https://github.com/sparklemotion/nokogiri/issues/2842)]
+  * allows `<hr>` in `<select>` [[whatwg/html#3410](https://github.com/whatwg/html/issues/3410), [whatwg/html#9124](https://github.com/whatwg/html/pull/9124)]
 
 
 ### Deprecated
diff --git a/gumbo-parser/src/parser.c b/gumbo-parser/src/parser.c
index 0ed8731a8c4..67812b23fe4 100644
--- a/gumbo-parser/src/parser.c
+++ b/gumbo-parser/src/parser.c
@@ -3964,6 +3964,18 @@ static void handle_in_select(GumboParser* parser, GumboToken* token) {
     insert_element_from_token(parser, token);
     return;
   }
+  if (tag_is(token, kStartTag, GUMBO_TAG_HR)) {
+    if (node_html_tag_is(get_current_node(parser), GUMBO_TAG_OPTION)) {
+      pop_current_node(parser);
+    }
+    if (node_html_tag_is(get_current_node(parser), GUMBO_TAG_OPTGROUP)) {
+      pop_current_node(parser);
+    }
+    insert_element_from_token(parser, token);
+    pop_current_node(parser);
+    acknowledge_self_closing_tag(parser);
+    return;
+  }
   if (tag_is(token, kEndTag, GUMBO_TAG_OPTGROUP)) {
     GumboVector* open_elements = &parser->_parser_state->_open_elements;
     if (
diff --git a/test/html5/test_tree_construction.rb b/test/html5/test_tree_construction.rb
index ac4684227ee..7e01be866c8 100644
--- a/test/html5/test_tree_construction.rb
+++ b/test/html5/test_tree_construction.rb
@@ -35,7 +35,12 @@ def compare_nodes(node, ng_node)
       assert_equal(
         node[:children].length,
         ng_node.children.length,
-        "Element <#{node[:tag]}> has wrong number of children #{ng_node.children.map(&:name)} in #{@test[:data]}",
+        [
+          "Element <#{node[:tag]}> has wrong number of children #{ng_node.children.map(&:name)}",
+          "   Input: #{@test[:data]}",
+          "Expected: #{@test[:raw].join("\n          ")}",
+          "  Parsed: #{ng_node.to_html}",
+        ].join("\n"),
       )
     when Nokogiri::XML::Node::TEXT_NODE, Nokogiri::XML::Node::CDATA_SECTION_NODE
       # We preserve the CDATA in the tree, but the tests represent it as text.
@@ -205,9 +210,12 @@ def self.parse_test(test_data)
       children: [],
     }
     open_nodes = [document]
+    test[:raw] = []
     while index < lines.length
       raise(BadHtml5libFormat, "Expected '| ' but got #{lines[index]}") unless /^\| ( *)([^ ].*$)/ =~ lines[index]
 
+      test[:raw] << lines[index]
+
       depth = $LAST_MATCH_INFO[1].length
       if depth.odd?
         raise(BadHtml5libFormat, "Invalid nesting depth")
diff --git a/test/html5lib-tests b/test/html5lib-tests
index 66f49b1de04..c67f90eacac 160000
--- a/test/html5lib-tests
+++ b/test/html5lib-tests
@@ -1 +1 @@
-Subproject commit 66f49b1de0487b8077f73813137149d15dc43af4
+Subproject commit c67f90eacac14e022b1f2c2e5ac559879581e9ff