diff --git a/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml b/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
index 8b0a7f3a11..8bd1adfda9 100644
--- a/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
@@ -181,11 +181,11 @@
 
       <screen>&prompt.root; <userinput>pkg_add -r firefox</userinput></screen>
 
-      <para>This will install <application>Firefox</application> 2.X,
-	if you want to run <application>Firefox</application> 3.X,
+      <para>This will install <application>Firefox</application> 3.6,
+	if you want to run <application>Firefox</application> 3.5,
 	use instead:</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r firefox3</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg_add -r firefox35</userinput></screen>
 
       <para>You can also use the Ports Collection if you
          prefer to compile from source code:</para>
@@ -193,9 +193,9 @@
       <screen>&prompt.root; <userinput>cd /usr/ports/www/firefox</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
-      <para>For <application>Firefox</application> 3.X, in the
+      <para>For <application>Firefox</application> 3.5, in the
 	previous command replace <literal>firefox</literal> with
-	<literal>firefox3</literal>.</para>
+	<literal>firefox35</literal>.</para>
     </sect2>
 
     <sect2 id="moz-java-plugin">
@@ -204,6 +204,9 @@
       <note>
 	<para>In this section and in the next one, we assume you have
 	  already installed <application>Firefox</application>.</para>
+
+	<para>Currently, the &java; plugin does not work with
+	  <application>Firefox</application> 3.6.</para>
       </note>
 
       <para>The &os; Foundation has a license with Sun Microsystems to
@@ -229,16 +232,22 @@
 	plugin should be listed there now.  If it is not, each user
 	will have to run the following command:</para>
 
-      <screen>&prompt.user; <userinput>ln -s /usr/local/diablo-jre1.6.0/plugin/i386/ns7/libjavaplugin_oji.so \
+      <screen>&prompt.user; <userinput>ln -s /usr/local/diablo-jre1.6.0/plugin/<replaceable>i386</replaceable>/ns7/libjavaplugin_oji.so \
   $HOME/.mozilla/plugins/</userinput></screen>
 
       <para>or, if you installed the <application>Diablo
 	&jdk;</application> package:</para>
 
-      <screen>&prompt.user; <userinput>ln -s /usr/local/diablo-jdk1.6.0/jre/plugin/i386/ns7/libjavaplugin_oji.so \
+      <screen>&prompt.user; <userinput>ln -s /usr/local/diablo-jdk1.6.0/jre/plugin/<replaceable>i386</replaceable>/ns7/libjavaplugin_oji.so \
   $HOME/.mozilla/plugins/</userinput></screen>
 
       <para>Then relaunch your browser.</para>
+
+      <note>
+	<para>The commands above assume you are running the
+	  &arch.i386; architecture, &arch.amd64; packages are also
+	  available.</para>
+      </note>
     </sect2>
 
     <sect2 id="moz-flash-plugin">