diff --git a/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml b/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
index 158e4b0bd1..d5082265e2 100644
--- a/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
@@ -573,7 +573,7 @@ export LD_PRELOAD</programlisting>
         <application>The Gimp Manual</application>.  Here is how to
         get them installed:</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/ports/graphics/gimp1</userinput>
+      <screen>&prompt.root; <userinput>cd /usr/ports/graphics/gimp</userinput>
 &prompt.root; <userinput>make install clean</userinput>
 &prompt.root; <userinput>cd /usr/ports/graphics/gimp-manual-pdf</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
@@ -584,10 +584,9 @@ export LD_PRELOAD</programlisting>
           directory of the ports collection holds the development
           version of <application>The GIMP</application> in
           <filename role="package">graphics/gimp-devel</filename>.
-          HTML and &postscript; versions of
-          <application>The Gimp Manual</application> are in
-          <filename role="package">graphics/gimp-manual-html</filename> and
-          <filename role="package">graphics/gimp-manual-ps</filename>.</para>
+          An HTML version of
+          <application>The Gimp Manual</application> is available from
+          <filename role="package">graphics/gimp-manual-html</filename>.</para>
        </note>
     </sect2>
 
@@ -643,14 +642,14 @@ export LD_PRELOAD</programlisting>
         port.  However, you must bear in mind that it requires a lot of
         disk space and a fairly long time to compile.</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/ports/editors/openoffice</userinput>
+      <screen>&prompt.root; <userinput>cd /usr/ports/editors/openoffice-1.1</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
       <para>Once this is done, run the setup as the user who will use
         <application>OpenOffice.org</application> and choose a
         <option>standard workstation installation</option> by:</para>
 
-      <screen>&prompt.user; <userinput>cd /usr/ports/editors/openoffice</userinput>
+      <screen>&prompt.user; <userinput>cd /usr/ports/editors/openoffice-1.1</userinput>
 &prompt.user; <userinput>make install-user</userinput></screen>
 
       <para>If you want to use a localized version, here are the available
@@ -669,78 +668,128 @@ export LD_PRELOAD</programlisting>
 
           <tbody>
             <row>
-              <entry>Arabic</entry>
-              <entry><filename role="package">editors/openoffice-ar</filename></entry>
+              <entry>Catalan</entry>
+              <entry><filename role="package">editors/openoffice-1.1-ca</filename></entry>
+            </row>
+
+            <row>
+              <entry>Czech</entry>
+              <entry><filename role="package">editors/openoffice-1.1-cs</filename></entry>
             </row>
 
             <row>
               <entry>Danish</entry>
-              <entry><filename role="package">editors/openoffice-dk</filename></entry>
-            </row>
-
-            <row>
-              <entry>Spanish</entry>
-              <entry><filename role="package">editors/openoffice-es</filename></entry>
+              <entry><filename role="package">editors/openoffice-1.1-dk</filename></entry>
             </row>
 
             <row>
               <entry>Greek</entry>
-              <entry><filename role="package">editors/openoffice-gr</filename></entry>
+              <entry><filename role="package">editors/openoffice-1.1-el</filename></entry>
+            </row>
+
+            <row>
+              <entry>Spanish</entry>
+              <entry><filename role="package">editors/openoffice-1.1-es</filename></entry>
+            </row>
+
+            <row>
+              <entry>Estonian</entry>
+              <entry><filename role="package">editors/openoffice-1.1-et</filename></entry>
+            </row>
+
+            <row>
+              <entry>Finnish</entry>
+              <entry><filename role="package">editors/openoffice-1.1-fi</filename></entry>
             </row>
 
             <row>
               <entry>Italian</entry>
-              <entry><filename role="package">editors/openoffice-it</filename></entry>
+              <entry><filename role="package">editors/openoffice-1.1-it</filename></entry>
             </row>
 
             <row>
               <entry>Dutch</entry>
-              <entry><filename role="package">editors/openoffice-nl</filename></entry>
+              <entry><filename role="package">editors/openoffice-1.1-nl</filename></entry>
             </row>
 
             <row>
               <entry>Swedish</entry>
-              <entry><filename role="package">editors/openoffice-se</filename></entry>
+              <entry><filename role="package">editors/openoffice-1.1-se</filename></entry>
+            </row>
+
+            <row>
+              <entry>Slovak</entry>
+              <entry><filename role="package">editors/openoffice-1.1-sk</filename></entry>
+            </row>
+
+            <row>
+              <entry>Slovenian</entry>
+              <entry><filename role="package">editors/openoffice-1.1-sl_SI</filename></entry>
             </row>
 
             <row>
               <entry>Turkish</entry>
-              <entry><filename role="package">editors/openoffice-tr</filename></entry>
+              <entry><filename role="package">editors/openoffice-1.1-tr</filename></entry>
+            </row>
+
+            <row>
+              <entry>Arabic</entry>
+              <entry><filename role="package">arabic/openoffice-1.1</filename></entry>
+            </row>
+
+            <row>
+              <entry>Chinese (Simplified)</entry>
+              <entry><filename role="package">chinese/openoffice-1.1-zh_CN</filename></entry>
+            </row>
+
+            <row>
+              <entry>Chinese (Traditional)</entry>
+              <entry><filename role="package">chinese/openoffice-1.1-zh_TW</filename></entry>
             </row>
 
             <row>
               <entry>French</entry>
-              <entry><filename role="package">french/openoffice</filename></entry>
+              <entry><filename role="package">french/openoffice-1.1</filename></entry>
             </row>
 
             <row>
               <entry>German</entry>
-              <entry><filename role="package">german/openoffice</filename></entry>
+              <entry><filename role="package">german/openoffice-1.1</filename></entry>
+            </row>
+
+            <row>
+              <entry>Hungarian</entry>
+              <entry><filename role="package">hungarian/openoffice-1.1</filename></entry>
             </row>
 
             <row>
               <entry>Japanese</entry>
-              <entry><filename role="package">japanese/openoffice</filename></entry>
+              <entry><filename role="package">japanese/openoffice-1.1</filename></entry>
             </row>
 
             <row>
               <entry>Korean</entry>
-              <entry><filename role="package">korean/openoffice</filename></entry>
+              <entry><filename role="package">korean/openoffice-1.1</filename></entry>
             </row>
 	    
             <row>
               <entry>Polish</entry>
-              <entry><filename role="package">polish/openoffice</filename></entry>
+              <entry><filename role="package">polish/openoffice-1.1</filename></entry>
             </row>
 	    
+            <row>
+              <entry>Portuguese (Brazil)</entry>
+              <entry><filename role="package">portuguese/openoffice-1.1-pt_BR</filename></entry>
+            </row>
+
             <row>
               <entry>Portuguese</entry>
-              <entry><filename role="package">portuguese/openoffice</filename></entry>
+              <entry><filename role="package">portuguese/openoffice-1.1-pt_PT</filename></entry>
             </row>
 
             <row>
               <entry>Russian</entry>
-              <entry><filename role="package">russian/openoffice</filename></entry>
+              <entry><filename role="package">russian/openoffice-1.1</filename></entry>
             </row>
           </tbody>
         </tgroup>
@@ -1131,8 +1180,8 @@ export LD_PRELOAD</programlisting>
 
 	  <row>
             <entry><application>Opera</application></entry>
-	    <entry><literal>linux-opera</literal></entry>
-	    <entry><filename role="package">www/linux-opera</filename></entry>
+	    <entry><literal>opera</literal></entry>
+	    <entry><filename role="package">www/opera</filename></entry>
 	  </row>
 
 	  <row>
@@ -1150,19 +1199,19 @@ export LD_PRELOAD</programlisting>
 	  <row>
             <entry><application>AbiWord</application></entry>
 	    <entry><literal>AbiWord-gnome</literal></entry>
-	    <entry><filename role="package">editors/AbiWord</filename></entry>
+	    <entry><filename role="package">editors/AbiWord2</filename></entry>
 	  </row>
 
 	  <row>
             <entry><application>The GIMP</application></entry>
 	    <entry><literal>gimp</literal></entry>
-	    <entry><filename role="package">graphics/gimp1</filename></entry>
+	    <entry><filename role="package">graphics/gimp</filename></entry>
 	  </row>
 
 	  <row>
             <entry><application>OpenOffice.org</application></entry>
 	    <entry><literal>openoffice</literal></entry>
-	    <entry><filename role="package">editors/openoffice</filename></entry>
+	    <entry><filename role="package">editors/openoffice-1.1</filename></entry>
 	  </row>
 
 	  <row>