Index: src/profile-preferences.glade
===================================================================
--- src/profile-preferences.glade	(revision 3436)
+++ src/profile-preferences.glade	(working copy)
@@ -291,6 +291,44 @@
 	      </child>
 
 	      <child>
+<widget class="GtkCheckButton" id="highlightonbell-checkbutton">
+  <property name="visible">True</property>
+  <property name="can_focus">True</property>
+  <property name="label" translatable="yes">Flash window _icon and bold tab title on 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="highlightfocusedonbell-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 and window</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>
Index: src/terminal-profile.c
===================================================================
--- src/terminal-profile.c	(revision 3436)
+++ src/terminal-profile.c	(working copy)
@@ -80,6 +80,8 @@
   PROP_USE_THEME_COLORS,
   PROP_VISIBLE_NAME,
   PROP_WORD_CHARS,
+  PROP_HIGHLIGHT_ON_BELL,
+  PROP_HIGHLIGHT_FOCUSED_ON_BELL,
   LAST_PROP
 };
 
@@ -97,6 +99,8 @@
 #define KEY_EXIT_ACTION "exit_action"
 #define KEY_FONT "font"
 #define KEY_FOREGROUND_COLOR "foreground_color"
+#define KEY_HIGHLIGHT_ON_BELL "highlight_on_bell"
+#define KEY_HIGHLIGHT_FOCUSED_ON_BELL "highlight_focused_on_bell_focused"
 #define KEY_LOGIN_SHELL "login_shell"
 #define KEY_PALETTE "palette"
 #define KEY_SCROLL_BACKGROUND "scroll_background"
@@ -131,6 +135,8 @@
 #define DEFAULT_EXIT_ACTION           (TERMINAL_EXIT_CLOSE)
 #define DEFAULT_FONT                  ("Monospace 12")
 #define DEFAULT_FOREGROUND_COLOR      ("#000000")
+#define DEFAULT_HIGHLIGHT_ON_BELL     (FALSE)
+#define DEFAULT_HIGHLIGHT_FOCUSED_ON_BELL (FALSE)
 #define DEFAULT_LOGIN_SHELL           (FALSE)
 #define DEFAULT_NAME                  (NULL)
 #define DEFAULT_PALETTE               (terminal_palettes[TERMINAL_PALETTE_TANGO])
@@ -1286,6 +1292,8 @@
 
   TERMINAL_PROFILE_PROPERTY_BOOLEAN (ALLOW_BOLD, DEFAULT_ALLOW_BOLD, KEY_ALLOW_BOLD);
   TERMINAL_PROFILE_PROPERTY_BOOLEAN (DEFAULT_SHOW_MENUBAR, DEFAULT_DEFAULT_SHOW_MENUBAR, KEY_DEFAULT_SHOW_MENUBAR);
+  TERMINAL_PROFILE_PROPERTY_BOOLEAN (HIGHLIGHT_ON_BELL, DEFAULT_HIGHLIGHT_ON_BELL, KEY_HIGHLIGHT_ON_BELL);
+  TERMINAL_PROFILE_PROPERTY_BOOLEAN (HIGHLIGHT_FOCUSED_ON_BELL, DEFAULT_HIGHLIGHT_FOCUSED_ON_BELL, KEY_HIGHLIGHT_FOCUSED_ON_BELL);
   TERMINAL_PROFILE_PROPERTY_BOOLEAN (LOGIN_SHELL, DEFAULT_LOGIN_SHELL, KEY_LOGIN_SHELL);
   TERMINAL_PROFILE_PROPERTY_BOOLEAN (SCROLL_BACKGROUND, DEFAULT_SCROLL_BACKGROUND, KEY_SCROLL_BACKGROUND);
   TERMINAL_PROFILE_PROPERTY_BOOLEAN (SCROLL_ON_KEYSTROKE, DEFAULT_SCROLL_ON_KEYSTROKE, KEY_SCROLL_ON_KEYSTROKE);
Index: src/terminal-profile.h
===================================================================
--- src/terminal-profile.h	(revision 3436)
+++ src/terminal-profile.h	(working copy)
@@ -80,6 +80,8 @@
 #define TERMINAL_PROFILE_EXIT_ACTION            "exit-action"
 #define TERMINAL_PROFILE_FONT                   "font"
 #define TERMINAL_PROFILE_FOREGROUND_COLOR       "foreground-color"
+#define TERMINAL_PROFILE_HIGHLIGHT_ON_BELL      "highlight-on-bell"
+#define TERMINAL_PROFILE_HIGHLIGHT_FOCUSED_ON_BELL      "highlight-focused-on-bell"
 #define TERMINAL_PROFILE_LOGIN_SHELL            "login-shell"
 #define TERMINAL_PROFILE_NAME                   "name"
 #define TERMINAL_PROFILE_PALETTE                "palette"
Index: src/gnome-terminal.schemas.in
===================================================================
--- src/gnome-terminal.schemas.in	(revision 3436)
+++ src/gnome-terminal.schemas.in	(working copy)
@@ -247,6 +247,41 @@
     </schema>
 
     <schema>
+      <key>/schemas/apps/gnome-terminal/profiles/Default/highlight_on_bell</key>
+
+      <applyto>/apps/gnome-terminal/profiles/Default/highlight_on_bell</applyto>
+      <owner>gnome-terminal</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+        <short>Whether to flash the window icon and bold the tab when the terminal emits a bell</short>
+        <long>
+          If true, the X urgency hint will be set on the window
+		  and the tab's title will be made bold when the terminal
+		  emits a bell.
+        </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/gnome-terminal/profiles/Default/highlight_focus_on_bell</key>
+
+      <applyto>/apps/gnome-terminal/profiles/Default/highlight_focus_on_bell</applyto>
+      <owner>gnome-terminal</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+        <short>Whether to highlight the tab and flash the window icon when the terminal emits a bell even if the tab is focused</short>
+        <long>
+          If true and the GNOME Terminal window doesn't have the
+		  focus, the X urgency hint will be set on the window.
+		  If true and the GNOME Terminal tab doesn't have the
+		  focus, the tab's title will made bold.
+        </long>
+      </locale>
+    </schema>
+
+    <schema>
       <key>/schemas/apps/gnome-terminal/profiles/Default/word_chars</key>
       <applyto>/apps/gnome-terminal/profiles/Default/word_chars</applyto>
       <owner>gnome-terminal</owner>
Index: src/profile-editor.c
===================================================================
--- src/profile-editor.c	(revision 3436)
+++ src/profile-editor.c	(working copy)
@@ -217,6 +217,14 @@
     SET_SENSITIVE ("bell-checkbutton",
                    !terminal_profile_property_locked (profile, TERMINAL_PROFILE_SILENT_BELL));
 
+  if (!prop_name || prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_ON_BELL))
+    SET_SENSITIVE ("highlightonbell-checkbutton",
+                   !terminal_profile_property_locked (profile, TERMINAL_PROFILE_HIGHLIGHT_ON_BELL));
+
+  if (!prop_name || prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_FOCUSED_ON_BELL))
+    SET_SENSITIVE ("highlightfocusedonbell-checkbutton",
+                   !terminal_profile_property_locked (profile, TERMINAL_PROFILE_HIGHLIGHT_FOCUSED_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));
@@ -812,6 +820,8 @@
   CONNECT ("exit-action-combobox", TERMINAL_PROFILE_EXIT_ACTION);
   CONNECT ("font-selector", TERMINAL_PROFILE_FONT);
   CONNECT ("foreground-colorpicker", TERMINAL_PROFILE_FOREGROUND_COLOR);
+  CONNECT ("highlightonbell-checkbutton", TERMINAL_PROFILE_HIGHLIGHT_ON_BELL);
+  CONNECT ("highlightfocusedonbell-checkbutton", TERMINAL_PROFILE_HIGHLIGHT_FOCUSED_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);
Index: help/C/gnome-terminal.xml
===================================================================
--- help/C/gnome-terminal.xml	(revision 3436)
+++ help/C/gnome-terminal.xml	(working copy)
@@ -857,6 +857,25 @@
              </listitem> 
           </varlistentry> 
           <varlistentry> 
+            <term>
+               <guilabel>Flash window icon and bold the tab title on bell</guilabel> </term> 
+            <listitem> 
+                <para>
+                  Select this option to bold the tab title and flash the window icon if the terminal emits a bell.
+                </para>
+             </listitem> 
+          </varlistentry> 
+          <varlistentry> 
+            <term>
+                <guilabel>Flash window icon and bold the tab title on bell 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
+					(or if the window is focused if there are no tabs).
+                </para>
+             </listitem> 
+          </varlistentry> 
+          <varlistentry> 
              <term> 
                 <guilabel>Select-by-word characters</guilabel> </term> 
              <listitem> 
