diff -u gnome-panel-2.25.91/debian/changelog gnome-panel-2.25.91/debian/changelog
--- gnome-panel-2.25.91/debian/changelog
+++ gnome-panel-2.25.91/debian/changelog
@@ -1,3 +1,12 @@
+gnome-panel (1:2.25.91-0ubuntu3) jaunty; urgency=low
+
+  * 04_default_panel_config.patch: Modified to add in the indicator
+    applet to the default configuration. (LP: #331820)
+  * debian/control[.in]: Modified to make indicator-applet get installed
+    at the same time as the panel.
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 19 Feb 2009 13:36:22 -0600
+
 gnome-panel (1:2.25.91-0ubuntu2) jaunty; urgency=low
 
   * 25_dynamic_fusa_detection.patch: Adding a patch that removes the
diff -u gnome-panel-2.25.91/debian/control.in gnome-panel-2.25.91/debian/control.in
--- gnome-panel-2.25.91/debian/control.in
+++ gnome-panel-2.25.91/debian/control.in
@@ -57,7 +57,8 @@
          gnome-desktop-data (>= 2.10.0-1),
          gnome-control-center (>= 1:2.8.2-3),
          gnome-menus (>= 2.11.1-1),
-         gnome-about (>= 2.10.0-1)         
+         gnome-about (>= 2.10.0-1),
+         indicator-applet
 Recommends: gnome-applets (>= 2.12.1-1),
             gnome-session,
             evolution-data-server,
diff -u gnome-panel-2.25.91/debian/control gnome-panel-2.25.91/debian/control
--- gnome-panel-2.25.91/debian/control
+++ gnome-panel-2.25.91/debian/control
@@ -57,7 +57,8 @@
          gnome-desktop-data (>= 2.10.0-1),
          gnome-control-center (>= 1:2.8.2-3),
          gnome-menus (>= 2.11.1-1),
-         gnome-about (>= 2.10.0-1)         
+         gnome-about (>= 2.10.0-1),
+         indicator-applet
 Recommends: gnome-applets (>= 2.12.1-1),
             gnome-session,
             evolution-data-server,
diff -u gnome-panel-2.25.91/debian/patches/04_default_panel_config.patch gnome-panel-2.25.91/debian/patches/04_default_panel_config.patch
--- gnome-panel-2.25.91/debian/patches/04_default_panel_config.patch
+++ gnome-panel-2.25.91/debian/patches/04_default_panel_config.patch
@@ -1,5 +1,6 @@
---- gnome-panel-2.25.91.gnome/gnome-panel/panel-default-setup.entries	2009-02-17 10:25:39.000000000 +0100
-+++ gnome-panel-2.25.91/gnome-panel/panel-default-setup.entries	2009-02-17 15:02:32.000000000 +0100
+diff -ur gnome-panel-2.25.91/gnome-panel/panel-default-setup.entries gnome-panel-ted/gnome-panel/panel-default-setup.entries
+--- gnome-panel-2.25.91/gnome-panel/panel-default-setup.entries	2009-02-17 03:25:39.000000000 -0600
++++ gnome-panel-ted/gnome-panel/panel-default-setup.entries	2009-02-19 13:31:30.000000000 -0600
 @@ -35,6 +35,12 @@
            <value>
              <string>email_launcher</string>
@@ -22,7 +23,17 @@
            </value>
            <value>
              <string>clock</string>
-@@ -64,6 +70,12 @@
+@@ -56,6 +62,9 @@
+             <string>notification_area</string>
+           </value>
+           <value>
++            <string>indicator_applet</string>
++          </value>
++          <value>
+             <string>show_desktop_button</string>
+           </value>
+           <value>
+@@ -64,6 +73,12 @@
            <value>
              <string>workspace_switcher</string>
            </value>
@@ -35,7 +46,7 @@
          </list>
        </value>
      </entry>
-@@ -259,7 +271,7 @@
+@@ -259,7 +274,7 @@
        <key>objects/browser_launcher/launcher_location</key>
        <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
        <value>
@@ -44,7 +55,7 @@
        </value>
      </entry>
  
-@@ -313,7 +325,7 @@
+@@ -313,7 +328,7 @@
        <key>objects/email_launcher/launcher_location</key>
        <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
        <value>
@@ -53,15 +64,14 @@
        </value>
      </entry>
  
-@@ -326,59 +338,113 @@
+@@ -326,59 +341,113 @@
      <entry><key>objects/email_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
      <entry><key>objects/email_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
  
 -  <!-- Window Menu Applet -->
 + <!-- Yelp Launcher -->
- 
-     <entry>
--      <key>applets/window_menu/object_type</key>
++
++    <entry>
 +      <key>objects/yelp_launcher/object_type</key>
 +      <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
 +      <value>
@@ -114,8 +124,9 @@
 +    <entry><key>objects/yelp_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
 +
 + <!-- Mixer Applet -->
-+
-+    <entry>
+ 
+     <entry>
+-      <key>applets/window_menu/object_type</key>
 +      <key>applets/mixer/object_type</key>
        <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
        <value>
@@ -184,7 +195,7 @@
  
    <!-- Clock Applet -->
  
-@@ -434,6 +500,54 @@
+@@ -434,6 +503,54 @@
      <entry><key>applets/clock/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
      <entry><key>applets/clock/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
  
@@ -239,19 +250,73 @@
    <!-- Notification Area Applet -->
  
      <entry>
-@@ -454,7 +568,7 @@
+@@ -454,7 +571,7 @@
        <key>applets/notification_area/position</key>
        <schema_key>/schemas/apps/panel/objects/position</schema_key>
        <value>
 -        <int>3</int>
-+        <int>4</int>
++        <int>5</int>
        </value>
      </entry>
      <entry>
-@@ -488,6 +602,60 @@
+@@ -488,6 +605,114 @@
      <entry><key>applets/notification_area/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
      <entry><key>applets/notification_area/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
  
++  <!-- Indicator Applet -->
++
++    <entry>
++      <key>applets/indicator_applet/object_type</key>
++      <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
++      <value>
++        <string>bonobo-applet</string>
++      </value>
++    </entry>
++    <entry>
++      <key>applets/indicator_applet/toplevel_id</key>
++      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
++      <value>
++        <string>top_panel</string>
++      </value>
++    </entry>
++    <entry>
++      <key>applets/indicator_applet/position</key>
++      <schema_key>/schemas/apps/panel/objects/position</schema_key>
++      <value>
++        <int>4</int>
++      </value>
++    </entry>
++    <entry>
++      <key>applets/indicator_applet/panel_right_stick</key>
++      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
++      <value>
++        <bool>true</bool>
++      </value>
++    </entry>
++    <entry>
++      <key>applets/indicator_applet/locked</key>
++      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
++      <value>
++        <bool>true</bool>
++      </value>
++    </entry>
++    <entry>
++      <key>applets/indicator_applet/bonobo_iid</key>
++      <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
++      <value>
++        <string>OAFIID:GNOME_IndicatorApplet</string>
++      </value>
++    </entry>
++
++    <entry><key>applets/indicator_applet/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
++    <entry><key>applets/indicator_applet/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
++    <entry><key>applets/indicator_applet/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
++    <entry><key>applets/indicator_applet/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
++    <entry><key>applets/indicator_applet/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
++    <entry><key>applets/indicator_applet/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
++    <entry><key>applets/indicator_applet/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
++    <entry><key>applets/indicator_applet/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
++
 +  <!-- Fast User Switch Applet -->
 +
 +    <entry>
@@ -309,7 +374,7 @@
    <!-- Show Desktop Applet -->
  
      <entry>
-@@ -616,7 +784,7 @@
+@@ -616,7 +841,7 @@
        <key>applets/workspace_switcher/position</key>
        <schema_key>/schemas/apps/panel/objects/position</schema_key>
        <value>
@@ -318,7 +383,7 @@
        </value>
      </entry>
      <entry>
-@@ -650,6 +818,59 @@
+@@ -650,6 +875,59 @@
      <entry><key>applets/workspace_switcher/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
      <entry><key>applets/workspace_switcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>