diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml
index 95822420..27d914d2 100644
--- a/src/org.gnome.Terminal.gschema.xml
+++ b/src/org.gnome.Terminal.gschema.xml
@@ -182,6 +182,11 @@
       <summary>Whether to allow bold text</summary>
       <description>If true, allow applications in the terminal to make text boldface.</description>
     </key>
+    <key name="bold-is-bright" type="b">
+      <default>true</default>
+      <summary>Whether bold is also bright</summary>
+      <description>If true, setting bold on the first 8 colors also switches to their bright variants.</description>
+    </key>
     <key name="audible-bell" type="b">
       <default>true</default>
       <summary>Whether to ring the terminal bell</summary>
diff --git a/src/profile-editor.c b/src/profile-editor.c
index c23386bf..9f5c68b4 100644
--- a/src/profile-editor.c
+++ b/src/profile-editor.c
@@ -953,6 +953,10 @@ terminal_profile_edit (GSettings  *profile,
                                 (GSettingsBindGetMapping) string_to_enum,
                                 (GSettingsBindSetMapping) enum_to_string,
                                 vte_erase_binding_get_type, NULL);
+  g_settings_bind (profile,
+                   TERMINAL_PROFILE_BOLD_IS_BRIGHT_KEY,
+                   gtk_builder_get_object (builder, "bold-is-bright-checkbutton"),
+                   "active", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
   g_settings_bind (profile, TERMINAL_PROFILE_BOLD_COLOR_SAME_AS_FG_KEY,
                    gtk_builder_get_object (builder,
                                            "bold-color-checkbutton"),
diff --git a/src/profile-preferences.ui b/src/profile-preferences.ui
index 5adcb531..716c1808 100644
--- a/src/profile-preferences.ui
+++ b/src/profile-preferences.ui
@@ -1079,6 +1079,12 @@
                         <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
+                          <object class="GtkVBox" id="vbox8">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">6</property>
+                            <child>
+<!-- TODO: indent from here ... -->
                           <object class="GtkTable" id="table25">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -1416,6 +1422,30 @@
                               </packing>
                             </child>
                           </object>
+<!-- ... to here -->
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="bold-is-bright-checkbutton">
+                                <property name="label" translatable="yes">_Bold also enables bright</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0.5</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
                         </child>
                       </object>
                       <packing>
diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h
index 25259d1f..cb974300 100644
--- a/src/terminal-schemas.h
+++ b/src/terminal-schemas.h
@@ -32,6 +32,7 @@ G_BEGIN_DECLS
 
 #define TERMINAL_PROFILE_ALLOW_BOLD_KEY                 "allow-bold"
 #define TERMINAL_PROFILE_AUDIBLE_BELL_KEY               "audible-bell"
+#define TERMINAL_PROFILE_BOLD_IS_BRIGHT_KEY             "bold-is-bright"
 #define TERMINAL_PROFILE_BACKGROUND_COLOR_KEY           "background-color"
 #define TERMINAL_PROFILE_BACKSPACE_BINDING_KEY          "backspace-binding"
 #define TERMINAL_PROFILE_BOLD_COLOR_KEY                 "bold-color"
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index 40ae539a..bdf99fa7 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -864,6 +864,9 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
   if (!prop_name || prop_name == I_(TERMINAL_PROFILE_ALLOW_BOLD_KEY))
     vte_terminal_set_allow_bold (vte_terminal,
                                  g_settings_get_boolean (profile, TERMINAL_PROFILE_ALLOW_BOLD_KEY));
+  if (!prop_name || prop_name == I_(TERMINAL_PROFILE_BOLD_IS_BRIGHT_KEY))
+    vte_terminal_set_bold_is_bright (vte_terminal,
+                                     g_settings_get_boolean (profile, TERMINAL_PROFILE_BOLD_IS_BRIGHT_KEY));
 
   if (!prop_name || prop_name == I_(TERMINAL_PROFILE_CURSOR_BLINK_MODE_KEY))
     vte_terminal_set_cursor_blink_mode (vte_terminal,
