diff --git a/xsoft/graphweb/firefox.xml b/xsoft/graphweb/firefox.xml
index b1ed0b0870..8ae7c2b5ec 100644
--- a/xsoft/graphweb/firefox.xml
+++ b/xsoft/graphweb/firefox.xml
@@ -178,11 +178,12 @@ EOF</userinput></screen>
     <systemitem class="username">root</systemitem> user, install the
     package:</para>
 
-<screen role="root"><userinput>tar -xfv firefox-build-dir/dist/firefox-*.tar.bz2 -C /usr/lib &amp;&amp;
-ln -sfv ../lib/firefox/firefox /usr/bin/firefox &amp;&amp;
+<screen role="root"><userinput>mkdir /usr/lib/firefox-&firefox-version; &amp;&amp;
+tar -xfv firefox-build-dir/dist/firefox-*.tar.bz2 -C /usr/lib/firefox-&firefox-version; --strip-components=1 &amp;&amp;
+ln -sfv ../lib/firefox-&firefox-version;/firefox /usr/bin/firefox &amp;&amp;
 mkdir -p /usr/lib/mozilla/plugins &amp;&amp;
-ln -sv ../mozilla/plugins /usr/lib/firefox &amp;&amp;
-chown -R -v root:root /usr/lib/firefox</userinput></screen>
+ln -sv ../mozilla/plugins /usr/lib/firefox-&firefox-version; &amp;&amp;
+chown -R -v root:root /usr/lib/firefox-&firefox-version;</userinput></screen>
 
     <para>If you have installed <application>Firefox</application> linked
     against an already installed <application>Xulrunner</application>, as the
@@ -214,10 +215,12 @@ chown -R -v root:root /usr/lib/firefox-&firefox-version;</userinput></screen>
     this creates a <application>Firefox</application> tarball.</para>
 
     <para><command>tar -xfv firefox-build-dir/dist ...</command>: This untars
-    <application>Firefox</application> in /usr/lib. Untaring it (instead of
-    running make install) prevents it installing
-    /usr/lib/firefox-devel-&firefox-version; which contains about 430 MB of
-    files. If you need any of those files, they're in
+    <application>Firefox</application> in /usr/lib. The
+    <option>--strip-components=1</option> option removes the leading
+    &apos;firefox&apos; directory from the filenames, allowing us to untar it
+    into a versioned directory. Untaring it (instead of running make install)
+    prevents it installing /usr/lib/firefox-devel-&firefox-version; which
+    contains about 430 MB of files. If you need any of those files, they're in
     <xref linkend="xulrunner"/></para>
 
     <para><command>make -C firefox-build-dir install</command>: This runs
@@ -247,10 +250,8 @@ chown -R -v root:root /usr/lib/firefox-&firefox-version;</userinput></screen>
         <seg>firefox</seg>
         <seg>Numerous libraries, browser components, plugins, extensions, and
         helper modules installed in <filename
-        class='directory'>/usr/lib/firefox</filename> or <filename
-        class='directory'>/usr/lib/firefox-&firefox-version;</filename>
-        (depending whether you untared it or ran make install)</seg>
-        <seg>/usr/lib/firefox</seg>
+        class='directory'>/usr/lib/firefox-&firefox-version;</filename>.</seg>
+        <seg>/usr/lib/firefox-&firefox-version;</seg>
       </seglistitem>
     </segmentedlist>