diff --git a/help/C/gnome-terminal.xml b/help/C/gnome-terminal.xml
index 6be0a2b..20857d8 100644
--- a/help/C/gnome-terminal.xml
+++ b/help/C/gnome-terminal.xml
@@ -866,6 +866,24 @@ text-based commands through a shell such as Bash.
              </listitem> 
           </varlistentry> 
           <varlistentry> 
+             <term>
+                 <guilabel>Bold the tab title when the terminal rings the bell</guilabel> </term> 
+             <listitem> 
+                 <para>
+                   Select this option to make the tab's title bold if the terminal rings the bell.
+                 </para>
+              </listitem> 
+           </varlistentry> 
+           <varlistentry> 
+             <term>
+                 <guilabel>...even if I'm working in that tab</guilabel> </term> 
+             <listitem> 
+                 <para>
+                     Select this option to make the above option apply even if the tab is focused.
+                 </para>
+              </listitem> 
+           </varlistentry> 
+          <varlistentry> 
              <term> 
                 <guilabel>Select-by-word characters</guilabel> </term> 
              <listitem> 
diff --git a/src/profile-editor.c b/src/profile-editor.c
index fce0c93..315f1cd 100644
--- a/src/profile-editor.c
+++ b/src/profile-editor.c
@@ -231,6 +231,17 @@ profile_notify_sensitivity_cb (TerminalProfile *profile,
     SET_SENSITIVE ("bell-checkbutton",
                    !terminal_profile_property_locked (profile, TERMINAL_PROFILE_SILENT_BELL));
 
+   if (!prop_name ||
+       prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_TAB_ON_BELL) ||
+       prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_FOCUSED_TAB_ON_BELL))
+     {
+       SET_SENSITIVE ("highlight-tab-on-bell-checkbutton",
+                      !terminal_profile_property_locked (profile, TERMINAL_PROFILE_HIGHLIGHT_TAB_ON_BELL));
+       SET_SENSITIVE ("highlight-focused-tab-on-bell-checkbutton",
+                      terminal_profile_get_property_boolean (profile, TERMINAL_PROFILE_HIGHLIGHT_TAB_ON_BELL) &&
+                      !terminal_profile_property_locked (profile, TERMINAL_PROFILE_HIGHLIGHT_FOCUSED_TAB_ON_BELL));
+     }
+
   if (!prop_name || prop_name == I_(TERMINAL_PROFILE_WORD_CHARS))
     SET_SENSITIVE ("word-chars-entry",
                    !terminal_profile_property_locked (profile, TERMINAL_PROFILE_WORD_CHARS));
@@ -878,6 +889,8 @@ terminal_profile_edit (TerminalProfile *profile,
   CONNECT ("exit-action-combobox", TERMINAL_PROFILE_EXIT_ACTION);
   CONNECT ("font-selector", TERMINAL_PROFILE_FONT);
   CONNECT ("foreground-colorpicker", TERMINAL_PROFILE_FOREGROUND_COLOR);
+  CONNECT ("highlight-tab-on-bell-checkbutton", TERMINAL_PROFILE_HIGHLIGHT_TAB_ON_BELL);
+  CONNECT ("highlight-focused-tab-on-bell-checkbutton", TERMINAL_PROFILE_HIGHLIGHT_FOCUSED_TAB_ON_BELL);
   CONNECT ("image-radiobutton", TERMINAL_PROFILE_BACKGROUND_TYPE);
   CONNECT ("login-shell-checkbutton", TERMINAL_PROFILE_LOGIN_SHELL);
   CONNECT ("profile-name-entry", TERMINAL_PROFILE_VISIBLE_NAME);
diff --git a/src/profile-preferences.glade b/src/profile-preferences.glade
index 42601e0..aff7436 100644
--- a/src/profile-preferences.glade
+++ b/src/profile-preferences.glade
@@ -291,6 +291,44 @@
 	      </child>
 
 	      <child>
+		<widget class="GtkCheckButton" id="highlight-tab-on-bell-checkbutton">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">_Bold the tab title when the terminal rings the bell</property>
+		  <property name="use_underline">True</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
+		  <property name="active">False</property>
+		  <property name="inconsistent">False</property>
+		  <property name="draw_indicator">True</property>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkCheckButton" id="highlight-focused-tab-on-bell-checkbutton">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">..._even if I am working in that tab</property>
+		  <property name="use_underline">True</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
+		  <property name="active">False</property>
+		  <property name="inconsistent">False</property>
+		  <property name="draw_indicator">True</property>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+
+	      <child>
 		<widget class="GtkHBox" id="hbox140">
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
diff --git a/src/terminal-profile.c b/src/terminal-profile.c
index 3481d5e..802d696 100644
--- a/src/terminal-profile.c
+++ b/src/terminal-profile.c
@@ -86,6 +86,8 @@ enum
   PROP_USE_THEME_COLORS,
   PROP_VISIBLE_NAME,
   PROP_WORD_CHARS,
+  PROP_HIGHLIGHT_TAB_ON_BELL,
+  PROP_HIGHLIGHT_FOCUSED_TAB_ON_BELL,
   LAST_PROP
 };
 
@@ -107,6 +109,8 @@ enum
 #define KEY_EXIT_ACTION "exit_action"
 #define KEY_FONT "font"
 #define KEY_FOREGROUND_COLOR "foreground_color"
+#define KEY_HIGHLIGHT_TAB_ON_BELL "highlight_tab_on_bell"
+#define KEY_HIGHLIGHT_FOCUSED_TAB_ON_BELL "highlight_focused_tab_on_bell"
 #define KEY_LOGIN_SHELL "login_shell"
 #define KEY_PALETTE "palette"
 #define KEY_SCROLL_BACKGROUND "scroll_background"
@@ -146,6 +150,8 @@ enum
 #define DEFAULT_EXIT_ACTION           (TERMINAL_EXIT_CLOSE)
 #define DEFAULT_FONT                  ("Monospace 12")
 #define DEFAULT_FOREGROUND_COLOR      ("#000000")
+#define DEFAULT_HIGHLIGHT_TAB_ON_BELL (FALSE)
+#define DEFAULT_HIGHLIGHT_FOCUSED_TAB_ON_BELL (FALSE)
 #define DEFAULT_LOGIN_SHELL           (FALSE)
 #define DEFAULT_NAME                  (NULL)
 #define DEFAULT_PALETTE               (terminal_palettes[TERMINAL_PALETTE_TANGO])
@@ -1309,6 +1315,8 @@ terminal_profile_class_init (TerminalProfileClass *klass)
   TERMINAL_PROFILE_PROPERTY_BOOLEAN (USE_SKEY, DEFAULT_USE_SKEY, KEY_USE_SKEY);
   TERMINAL_PROFILE_PROPERTY_BOOLEAN (USE_SYSTEM_FONT, DEFAULT_USE_SYSTEM_FONT, KEY_USE_SYSTEM_FONT);
   TERMINAL_PROFILE_PROPERTY_BOOLEAN (USE_THEME_COLORS, DEFAULT_USE_THEME_COLORS, KEY_USE_THEME_COLORS);
+  TERMINAL_PROFILE_PROPERTY_BOOLEAN (HIGHLIGHT_TAB_ON_BELL, DEFAULT_HIGHLIGHT_TAB_ON_BELL, KEY_HIGHLIGHT_TAB_ON_BELL);
+  TERMINAL_PROFILE_PROPERTY_BOOLEAN (HIGHLIGHT_FOCUSED_TAB_ON_BELL, DEFAULT_HIGHLIGHT_FOCUSED_TAB_ON_BELL, KEY_HIGHLIGHT_FOCUSED_TAB_ON_BELL);
 
   TERMINAL_PROFILE_PROPERTY_BOXED (BACKGROUND_COLOR, GDK_TYPE_COLOR, KEY_BACKGROUND_COLOR);
   TERMINAL_PROFILE_PROPERTY_BOXED (BOLD_COLOR, GDK_TYPE_COLOR, KEY_BOLD_COLOR);
diff --git a/src/terminal-profile.h b/src/terminal-profile.h
index ad52a53..1eb94e3 100644
--- a/src/terminal-profile.h
+++ b/src/terminal-profile.h
@@ -84,6 +84,8 @@ typedef enum
 #define TERMINAL_PROFILE_EXIT_ACTION            "exit-action"
 #define TERMINAL_PROFILE_FONT                   "font"
 #define TERMINAL_PROFILE_FOREGROUND_COLOR       "foreground-color"
+#define TERMINAL_PROFILE_HIGHLIGHT_TAB_ON_BELL  "highlight-tab-on-bell"
+#define TERMINAL_PROFILE_HIGHLIGHT_FOCUSED_TAB_ON_BELL  "highlight-focused-tab-on-bell"
 #define TERMINAL_PROFILE_LOGIN_SHELL            "login-shell"
 #define TERMINAL_PROFILE_NAME                   "name"
 #define TERMINAL_PROFILE_PALETTE                "palette"
diff --git a/src/terminal-tab-label.c b/src/terminal-tab-label.c
index b41603f..1d42957 100644
--- a/src/terminal-tab-label.c
+++ b/src/terminal-tab-label.c
@@ -62,6 +62,44 @@ close_button_clicked_cb (GtkWidget *widget,
 }
 
 static void
+sync_bell_raised (TerminalScreen *screen,
+                  GParamSpec *pspec,
+                  TerminalTabLabel *tab_label)
+{
+  gboolean bell_raised;
+
+  bell_raised = terminal_screen_get_bell_raised (screen);
+
+  if (bell_raised)
+    {
+      gboolean should_highlight;
+
+      should_highlight = terminal_profile_get_property_boolean (
+          terminal_screen_get_profile (screen),
+          TERMINAL_PROFILE_HIGHLIGHT_TAB_ON_BELL);
+
+      if (should_highlight)
+        {
+          gboolean screen_has_focus;
+          gboolean highlight_focused;
+
+          g_object_get (screen, "has-focus", &screen_has_focus, NULL);
+
+          highlight_focused = terminal_profile_get_property_boolean (
+              terminal_screen_get_profile (screen),
+              TERMINAL_PROFILE_HIGHLIGHT_FOCUSED_TAB_ON_BELL);
+
+          if (!screen_has_focus || highlight_focused)
+            {
+              terminal_tab_label_set_bold (tab_label, TRUE);
+            }
+        }
+    }
+  else
+    terminal_tab_label_set_bold (tab_label, FALSE);
+}
+
+static void
 sync_tab_label (TerminalScreen *screen,
                 GParamSpec *pspec,
                 GtkWidget *label)
@@ -154,6 +192,10 @@ terminal_tab_label_constructor (GType type,
   gtk_container_add (GTK_CONTAINER (close_button), image);
   gtk_box_pack_end (GTK_BOX (hbox), close_button, FALSE, FALSE, 0);
 
+  sync_bell_raised (priv->screen, FALSE, tab_label);
+  g_signal_connect (priv->screen, "notify::bell-raised",
+                    G_CALLBACK (sync_bell_raised), tab_label);
+
   sync_tab_label (priv->screen, NULL, label);
   g_signal_connect (priv->screen, "notify::title",
                     G_CALLBACK (sync_tab_label), label);
