diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 2dd97d6f84..732714ed73 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -47,6 +47,10 @@
     <listitem>
       <para>February 26th, 2015</para>
       <itemizedlist>
+        <listitem>
+          <para>[ken] - Update to firefox-36.0. Fixes
+          <ulink url="&blfs-ticket-root;6170">#6170</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[fernando] - Update to mpg123-1.22.0. Fixes
           <ulink url="&blfs-ticket-root;6176">#6176</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index 07cce6e758..3d666f5e59 100644
--- a/packages.ent
+++ b/packages.ent
@@ -590,7 +590,7 @@
 
 <!-- Chapter 35 -->
 <!ENTITY seamonkey-version            "2.32.1">
-<!ENTITY firefox-version              "35.0.1">
+<!ENTITY firefox-version              "36.0">
 
 <!-- Chapter 36 -->
 <!ENTITY asymptote-version            "2.32">
diff --git a/xsoft/graphweb/firefox.xml b/xsoft/graphweb/firefox.xml
index fba7a6e60f..714b436c0a 100644
--- a/xsoft/graphweb/firefox.xml
+++ b/xsoft/graphweb/firefox.xml
@@ -8,10 +8,10 @@
            "&mozilla-http;/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
   <!ENTITY firefox-download-ftp
            "&mozilla-ftp;/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
-  <!ENTITY firefox-md5sum        "82eda528e4570b181aadcee602afda2d">
-  <!ENTITY firefox-size          "168 MB">
-  <!ENTITY firefox-buildsize     "5.2 GB (78 MB installed)">
-  <!ENTITY firefox-time          "85 SBU">
+  <!ENTITY firefox-md5sum        "74190b0302782a5d25532def423355a7">
+  <!ENTITY firefox-size          "172 MB">
+  <!ENTITY firefox-buildsize     "3.3 GB (74 MB installed, also requires up to 1.7GB of virtual memory for linking during the build)">
+  <!ENTITY firefox-time          "25 SBU">
 ]>
 
 <sect1 id="firefox" xreflabel="Firefox-&firefox-version;">
@@ -129,6 +129,7 @@
       <xref linkend="gst10-plugins-good"/> and
       <xref linkend="gst10-libav"/> at runtime),
       <xref linkend="libnotify"/>,
+      <ulink url="https://code.google.com/p/libproxy/">libproxy</ulink>,
       <xref linkend="openjdk"/>,
       <xref linkend="pulseaudio"/>,
       <xref linkend="startup-notification"/>,
@@ -227,18 +228,19 @@ ac_add_options --with-system-zlib
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-build-dir</literal>
 EOF</userinput></screen>
 
+    <!-- this problem seems to have gone with 36.0
     <note><para>
       There is a problem on i686 systems when building
       <application>Firefox</application> with <application>gcc</application>
       versions ranging from 4.8 to 4.9.1 and using the switch
-      <quote>--enable-optimize</quote>. There are two alternatives. The best
+      <quote>\-\-enable-optimize</quote>. There are two alternatives. The best
       one is to upgrade <application>gcc</application> to version 4.9.2 or later
       because it will give better perfomance and smaller binaries.  However, if
       you do not wish to upgrade gcc, reduce the level of optimization with:
     </para>
 
 <screen><userinput>test $(uname -m) = "i686" &amp;&amp; sed -i 's/enable-optimize/&amp;=-O2/' mozconfig || true</userinput></screen>
-    </note>
+    </note>-->
 
     <para>
       Compile <application>Firefox</application> by issuing the following