diff -u yelp-2.16.2/debian/patches/06_ubuntu_index.patch yelp-2.16.2/debian/patches/06_ubuntu_index.patch
--- yelp-2.16.2/debian/patches/06_ubuntu_index.patch
+++ yelp-2.16.2/debian/patches/06_ubuntu_index.patch
@@ -1,10 +1,6 @@
-Index: data/scrollkeeper.xml
-===================================================================
-RCS file: /cvs/gnome/yelp/data/scrollkeeper.xml,v
-retrieving revision 1.4
-diff -u -r1.4 scrollkeeper.xml
---- data/scrollkeeper.xml	10 Jul 2006 23:50:00 -0000	1.4
-+++ data/scrollkeeper.xml	13 Sep 2006 21:06:07 -0000
+diff -Nur yelp-2.16.2/data/scrollkeeper.xml yelp-2.16.2.new/data/scrollkeeper.xml
+--- yelp-2.16.2/data/scrollkeeper.xml	2006-07-11 00:50:00.000000000 +0100
++++ yelp-2.16.2.new/data/scrollkeeper.xml	2006-12-22 22:19:32.000000000 +0000
 @@ -1,6 +1,9 @@
  <?xml version="1.0" encoding="UTF-8"?><!-- -*- indent-tabs-mode: nil -*- -->
  <toc>
@@ -23,13 +19,9 @@
      <subject category="General|Linux|General"/>
      <subject category="General|Linux|Other"/>
      <subject category="General|Other"/>
-Index: data/toc.xml.in
-===================================================================
-RCS file: /cvs/gnome/yelp/data/toc.xml.in,v
-retrieving revision 1.18
-diff -u -r1.18 toc.xml.in
---- data/toc.xml.in	26 Jul 2006 14:24:48 -0000	1.18
-+++ data/toc.xml.in	13 Sep 2006 21:06:07 -0000
+diff -Nur yelp-2.16.2/data/toc.xml.in yelp-2.16.2.new/data/toc.xml.in
+--- yelp-2.16.2/data/toc.xml.in	2006-07-26 15:24:48.000000000 +0100
++++ yelp-2.16.2.new/data/toc.xml.in	2006-12-22 22:19:32.000000000 +0000
 @@ -1,9 +1,11 @@
  <?xml version="1.0" encoding="UTF-8"?>
  <?xml-stylesheet href="toc.xml.in.content/toc.css" type="text/css"?>
@@ -59,37 +51,17 @@
    <toc id="DesktopApplets">
      <_title>Panel Applets</_title>
      <_description>Applications specific to the panel</_description>
-@@ -63,6 +65,7 @@
-   <toc id="ApplicationsX">
+@@ -64,6 +66,7 @@
      <_title>X Applications</_title>
      <_description>Applications related to X Windows</_description>
-+  </toc>
    </toc>
++  </toc>
    <toc id="Other">
      <_title>Other Documentation</_title>
-Index: stylesheets/toc2html.xsl
-===================================================================
-RCS file: /cvs/gnome/yelp/stylesheets/toc2html.xsl,v
-retrieving revision 1.17
-diff -u -r1.17 toc2html.xsl
---- stylesheets/toc2html.xsl	10 Jul 2006 23:50:03 -0000	1.17
-+++ stylesheets/toc2html.xsl	13 Sep 2006 21:06:08 -0000
-@@ -151,6 +151,8 @@
-   <div class="docs">
-     <dl>
-       <xsl:for-each select="doc">
-+        <xsl:sort order="descending" data-type="number" 
-+                  select="normalize-space(@score)"/>
-         <xsl:sort select="normalize-space(title)"/>
-         <dt class="doc">
-           <a href="{@href}" title="{@href}">
-Index: src/yelp-toc-pager.c
-===================================================================
-RCS file: /cvs/gnome/yelp/src/yelp-toc-pager.c,v
-retrieving revision 1.93
-diff -u -r1.93 yelp-toc-pager.c
---- src/yelp-toc-pager.c	3 Sep 2006 15:35:51 -0000	1.93
-+++ src/yelp-toc-pager.c	13 Sep 2006 21:06:11 -0000
+     <_description>Miscellaneous documents</_description>
+diff -Nur yelp-2.16.2/src/yelp-toc-pager.c yelp-2.16.2.new/src/yelp-toc-pager.c
+--- yelp-2.16.2/src/yelp-toc-pager.c	2006-09-03 16:35:51.000000000 +0100
++++ yelp-2.16.2.new/src/yelp-toc-pager.c	2006-12-22 22:59:02.000000000 +0000
 @@ -2085,6 +2085,7 @@
  
      node = g_hash_table_lookup (priv->category_hash, category);
@@ -98,7 +70,7 @@
      text = yelp_doc_info_get_uri (doc_info, NULL, YELP_URI_TYPE_FILE);
      new = xmlNewChild (node, NULL, BAD_CAST "doc", NULL);
      xmlNewNsProp (new, NULL, BAD_CAST "href", BAD_CAST text);
-@@ -2095,6 +2096,39 @@
+@@ -2095,6 +2096,57 @@
  
      text = (gchar *) yelp_doc_info_get_description (doc_info);
      xmlNewTextChild (new, NULL, BAD_CAST "description", BAD_CAST text);
@@ -112,25 +84,43 @@
 +
 +	if (g_str_equal (id, 
 +			 "scrollkeeper.7fb11226-8a1d-11d9-9fcf-ff970c259736")) 
++	    xmlNewNsProp (new, NULL, BAD_CAST "score", BAD_CAST "14.0");
++	else if (g_str_equal (id, 
++			  "scrollkeeper.d8a3af46-8d5a-11db-8c4e-d252d62af366")) 
++	    xmlNewNsProp (new, NULL, BAD_CAST "score", BAD_CAST "13.0");
++	else if (g_str_equal (id, 
++			  "scrollkeeper.2937ac96-8d38-11db-99a5-f0d0be2024b4")) 
++	    xmlNewNsProp (new, NULL, BAD_CAST "score", BAD_CAST "12.0");
++	else if (g_str_equal (id, 
++			  "scrollkeeper.placeholder")) 
++	    xmlNewNsProp (new, NULL, BAD_CAST "score", BAD_CAST "11.0");
++	else if (g_str_equal (id, 
++			  "scrollkeeper.placeholder")) 
++	    xmlNewNsProp (new, NULL, BAD_CAST "score", BAD_CAST "10.0");
++	else if (g_str_equal (id, 
++			  "scrollkeeper.e2be544e-8d38-11db-85e5-90c26ca97f1b")) 
++	    xmlNewNsProp (new, NULL, BAD_CAST "score", BAD_CAST "9.0");
++	else if (g_str_equal (id, 
++			  "scrollkeeper.a4cecdc6-8d38-11db-807a-d364bb9186c1")) 
++	    xmlNewNsProp (new, NULL, BAD_CAST "score", BAD_CAST "8.0");
++	else if (g_str_equal (id, 
++			  "scrollkeeper.25d193ea-8d39-11db-87f5-d2bc391e8c35")) 
 +	    xmlNewNsProp (new, NULL, BAD_CAST "score", BAD_CAST "7.0");
 +	else if (g_str_equal (id, 
-+			  "scrollkeeper.14cb22f0-8bab-11d9-94ca-a0601d41c01a")) 
++			  "scrollkeeper.6f90ac56-8d38-11db-877f-aa344f458b94")) 
 +	    xmlNewNsProp (new, NULL, BAD_CAST "score", BAD_CAST "6.0");
 +	else if (g_str_equal (id, 
-+			  "scrollkeeper.6043549c-8570-4478-8639-25df628901a7"))
++			  "scrollkeeper.71c79042-8d39-11db-9fb4-b57a0350ad92")) 
 +	    xmlNewNsProp (new, NULL, BAD_CAST "score", BAD_CAST "5.0");
 +	else if (g_str_equal (id, 
-+			  "scrollkeeper.f8d2430a-604b-11da-862b-beb2ce422d56"))
++			  "scrollkeeper.f8d2430a-604b-11da-862b-beb2ce422d56")) 
 +	    xmlNewNsProp (new, NULL, BAD_CAST "score", BAD_CAST "4.0");
-+	else if (g_str_equal (id,
-+		          "scrollkeeper.120c3782-2229-11db-86f7-83fe74c27bb7"))
++	else if (g_str_equal (id, 
++			  "scrollkeeper.120c3782-2229-11db-86f7-83fe74c27bb7")) 
 +	    xmlNewNsProp (new, NULL, BAD_CAST "score", BAD_CAST "3.0");
-+	else if (g_str_equal (id,
-+   		          "scrollkeeper.da19bd9a-2228-11db-8f63-a34352a315f2"))
++	else if (g_str_equal (id, 
++			  "scrollkeeper.da19bd9a-2228-11db-8f63-a34352a315f2")) 
 +	    xmlNewNsProp (new, NULL, BAD_CAST "score", BAD_CAST "2.0");
-+	else if (g_str_equal (id,
-+			  "scrollkeeper.0f7168bc-605a-11da-8c3f-8680ebf614be"))
-+	    xmlNewNsProp (new, NULL, BAD_CAST "score", BAD_CAST "1.0");
 +	else
 +	    g_warning ("Found a non-specified Ubuntu guide");
 +    }
@@ -140,0 +131,99 @@
+diff -Nur yelp-2.16.2/stylesheets/toc2html.xsl yelp-2.16.2.new/stylesheets/toc2html.xsl
+--- yelp-2.16.2/stylesheets/toc2html.xsl	2006-07-11 00:50:03.000000000 +0100
++++ yelp-2.16.2.new/stylesheets/toc2html.xsl	2006-12-22 22:44:22.000000000 +0000
+@@ -72,7 +72,7 @@
+           position: absolute;
+           top: 4em;
+           left: 12px;
+-          width: 192px;
++          width: 292px;
+           min-height: 192px;
+           text-align: left;
+           /* padding-top: </xsl:text>
+@@ -101,7 +101,7 @@
+           opacity: .1;          
+         }
+         div[class~="rightbar"] {
+-          margin-left: 216px;
++          margin-left: 336px;
+           padding-bottom: 1em;
+           padding-top: 1em;
+           padding-left: 1em;
+@@ -151,6 +151,8 @@
+   <div class="docs">
+     <dl>
+       <xsl:for-each select="doc">
++        <xsl:sort order="descending" data-type="number" 
++                  select="normalize-space(@score)"/>
+         <xsl:sort select="normalize-space(title)"/>
+         <dt class="doc">
+           <a href="{@href}" title="{@href}">
+@@ -197,21 +199,7 @@
+       <xsl:apply-templates select="title"/>
+     </h1>
+     <div class="leftbar">
+-      <xsl:choose>
+-      <xsl:when test="@id= 'index'">
+-        <h2><xsl:value-of select="/toc/title"/></h2>
+-      </xsl:when>
+-      <xsl:otherwise>
+-        <a href="x-yelp-toc:index"><h2><xsl:value-of select="/toc/title"/>
+-      </h2></a>
+-      </xsl:otherwise>        
+-      </xsl:choose>
+-      <xsl:apply-templates mode="leftbar.mode" select="/toc">
+-        <xsl:with-param name="curid" select="@id"/>
+-      </xsl:apply-templates>
+-    </div>
+-    <div class="rightbar">
+-      <h3><xsl:apply-templates select="description/node()"/></h3>
++        <h2>Topics</h2>
+       <xsl:choose>
+         <!-- if there are documents and subsections, only print documents -->
+         <xsl:when test="doc[1] and toc[.//doc[1]]">
+@@ -230,35 +218,19 @@
+         </xsl:otherwise>
+       </xsl:choose>
+     </div>
++    <div class="rightbar">
++        <p><i>NB - this is a draft. The topics obviously need much shorter descriptions</i></p>
++       <h2>Ubuntu Help</h2>
++        <p>Some kind of introduction to the help system, point at the search function and the topics?</p>
++      <h2>Commonly Asked Questions</h2>
++        <p>These are placeholders for inserting links to common questions, such as:</p>
++        <p>MP3s</p>
++        <p>Flash plugins</p>
++        <p>Whatever else</p>
++    </div>
+   </div>
+ </xsl:template>
+ 
+-<!-- tricky recursive xslt -->
+-<xsl:template mode="leftbar.mode" match="toc">
+-  <xsl:param name="curid" select="0"/>
+-    <ul>
+-      <xsl:for-each select="toc[.//doc[1]]">
+-        <li class="toclist">
+-          <xsl:choose>
+-            <xsl:when test="@id != $curid">
+-              <a href="x-yelp-toc:{@id}">
+-                <xsl:value-of select="title[1]/node()"/>
+-              </a>
+-            </xsl:when>
+-            <xsl:otherwise>
+-              <xsl:value-of select="title[1]/node()"/>
+-            </xsl:otherwise>
+-          </xsl:choose>
+-          <xsl:if test="@id = $curid or .//toc[@id = $curid]">
+-            <xsl:apply-templates mode="leftbar.mode" select=".">
+-              <xsl:with-param name="curid" select="$curid"/>
+-            </xsl:apply-templates>
+-          </xsl:if>
+-        </li>
+-      </xsl:for-each>
+-    </ul>
+-</xsl:template>
+-
+ <xsl:template match="/">
+   <xsl:apply-templates select="//toc[@id = $yelp.toc.id]" />
+ </xsl:template>
diff -u yelp-2.16.2/debian/changelog yelp-2.16.2/debian/changelog
--- yelp-2.16.2/debian/changelog
+++ yelp-2.16.2/debian/changelog
@@ -1,3 +1,9 @@
+yelp (2.16.2-1ubuntu3) feisty; urgency=low
+
+  * Redesigning front page to go with the new document structure in ubuntu-docs. Sexy!
+
+ -- Matthew East <matt@localhost>  Fri, 22 Dec 2006 23:00:14 +0000
+
 yelp (2.16.2-1ubuntu2) feisty; urgency=low
 
   * debian/control.in: