diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index 868ab6b84e..620bdf3e3d 100644
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -193,7 +193,8 @@
       <xi:include href="xml/gtkradiotoolbutton.xml" />
       <xi:include href="xml/gtkpopover.xml" />
       <xi:include href="xml/gtkpopovermenu.xml" />
-      <xi:include href="xml/gtkcombo.xml" />
+      <xi:include href="xml/gtkoptionlist.xml" />
+      <xi:include href="xml/gtkoptionbutton.xml" />
     </chapter>
 
     <chapter id="SelectorWidgets">
diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index 7b1cb48512..67577a2d00 100644
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -978,36 +978,57 @@ gtk_combo_box_text_get_type
 </SECTION>
 
 <SECTION>
-<FILE>gtkcombo</FILE>
-<TITLE>GtkCombo</TITLE>
-GtkCombo
-gtk_combo_new
-gtk_combo_add_item
-gtk_combo_remove_item
-gtk_combo_item_set_sort_key
-gtk_combo_item_set_group_key
-gtk_combo_add_group
-gtk_combo_get_active
-gtk_combo_set_active
-gtk_combo_get_placeholder_text
-gtk_combo_set_placeholder_text
-gtk_combo_get_allow_custom
-gtk_combo_set_allow_custom
-gtk_combo_get_custom_text
-gtk_combo_set_custom_text
+<FILE>gtkoptionlist</FILE>
+<TITLE>GtkOptionList</TITLE>
+GtkOptionList
+gtk_option_list_new
+gtk_option_list_add_item
+gtk_option_list_remove_item
+gtk_option_list_item_get_text
+gtk_option_list_item_set_sort_key
+gtk_option_list_item_set_group_key
+gtk_option_list_add_group
+gtk_option_list_get_selected_items
+gtk_option_list_select_item
+gtk_option_list_unselect_item
+gtk_option_list_get_allow_custom
+gtk_option_list_set_allow_custom
+gtk_option_list_get_custom_text
+gtk_option_list_set_custom_text
+gtk_option_list_handle_key_event
 
 <SUBSECTION Standard>
-GTK_TYPE_COMBO
-GTK_COMBO
-GTK_IS_COMBO
-GTK_COMBO_CLASS
-GTK_IS_COMBO_CLASS
-GTK_COMBO_GET_CLASS
+GTK_TYPE_OPTION_LIST
+GTK_OPTION_LIST
+GTK_IS_OPTION_LIST
+GTK_OPTION_LIST_CLASS
+GTK_IS_OPTION_LIST_CLASS
+GTK_OPTION_LIST_GET_CLASS
 
 <SUBSECTION Private>
-gtk_combo_get_type
+gtk_option_list_get_type
 </SECTION>
 
+<SECTION>
+<FILE>gtkoptionbutton</FILE>
+<TITLE>GtkOptionButton</TITLE>
+GtkOptionButton
+gtk_option_button_new
+gtk_option_button_get_option_list
+gtk_option_button_get_placeholder_text
+gtk_option_button_set_placeholder_text
+
+<SUBSECTION Standard>
+GTK_TYPE_OPTION_BUTTON
+GTK_OPTION_BUTTON
+GTK_IS_OPTION_BUTTON
+GTK_OPTION_BUTTON_CLASS
+GTK_IS_OPTION_BUTTON_CLASS
+GTK_OPTION_BUTTON_GET_CLASS
+
+<SUBSECTION Private>
+gtk_option_button_get_type
+</SECTION>
 
 <SECTION>
 <FILE>gtkcontainer</FILE>
diff --git a/docs/reference/gtk/gtk3.types.in b/docs/reference/gtk/gtk3.types.in
index b3e486b764..25e0db7533 100644
--- a/docs/reference/gtk/gtk3.types.in
+++ b/docs/reference/gtk/gtk3.types.in
@@ -55,7 +55,6 @@ gtk_color_selection_dialog_get_type
 gtk_color_selection_get_type
 gtk_combo_box_get_type
 gtk_combo_box_text_get_type
-gtk_combo_get_type
 gtk_container_get_type
 gtk_css_provider_get_type
 gtk_dialog_get_type
@@ -132,6 +131,8 @@ gtk_mount_operation_get_type
 gtk_notebook_get_type
 gtk_numerable_icon_get_type
 gtk_offscreen_window_get_type
+gtk_option_button_get_type
+gtk_option_list_get_type
 gtk_orientable_get_type
 gtk_overlay_get_type
 gtk_page_setup_get_type