Index: general.ent
===================================================================
--- general.ent	(revision ac87f71665c0b2edf4266b8f88b5935253dc1b66)
+++ general.ent	(revision 1f786063dde3a62b3b0cf48fcb25f2b929b2cf99)
@@ -576,5 +576,5 @@
 <!ENTITY webkitgtk-version            "1.10.2">   <!-- Even minors only -->
 <!ENTITY webkitgtk2-version           "2.0.4">    <!-- Even minors only -->
-<!ENTITY xulrunner-version            "23.0.1">
+<!ENTITY xulrunner-version            "24.0">
 
 <!ENTITY gtk2-libdir                  "2.0/2.10.0">
@@ -716,5 +716,5 @@
 <!ENTITY gnash-version                "0.8.10">
 <!ENTITY gimp-version                 "2.8.6">
-<!ENTITY icedtea-web-version          "1.4">
+<!ENTITY icedtea-web-version          "1.4.1">
 <!ENTITY inkscape-version             "0.48.4">
 <!ENTITY pan-version                  "0.133">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision ac87f71665c0b2edf4266b8f88b5935253dc1b66)
+++ introduction/welcome/changelog.xml	(revision 1f786063dde3a62b3b0cf48fcb25f2b929b2cf99)
@@ -48,4 +48,13 @@
       <itemizedlist>
         <listitem>
+          <para>[fernando] - Update to icedtea-web-1.4.1. Fixes
+          <ulink url="&blfs-ticket-root;4065">#4065</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Updates to xulrunner-24.0 and firefox-24.0
+          linked to xulrunner. Partially fix 
+          <ulink url="&blfs-ticket-root;4063">#4063</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[igor] - Update to xinput-1.6.1.  Fixes
           <ulink url="&blfs-ticket-root;4061">#4061</ulink>.</para>
Index: x/lib/xulrunner.xml
===================================================================
--- x/lib/xulrunner.xml	(revision ac87f71665c0b2edf4266b8f88b5935253dc1b66)
+++ x/lib/xulrunner.xml	(revision 1f786063dde3a62b3b0cf48fcb25f2b929b2cf99)
@@ -9,8 +9,8 @@
   <!ENTITY xulrunner-download-ftp
            "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
-  <!ENTITY xulrunner-md5sum        "0fa25582fb5e0fba37c9f1add8370af2">
-  <!ENTITY xulrunner-size          "111 MB">
-  <!ENTITY xulrunner-buildsize     "4.9 GB (89 MB installed)">
-  <!ENTITY xulrunner-time          "94 SBU">
+  <!ENTITY xulrunner-md5sum        "06a4c0fe8d3a979aea2fce8d0fdbf328">
+  <!ENTITY xulrunner-size          "115 MB">
+  <!ENTITY xulrunner-buildsize     "3.9 GB (89 MB installed)">
+  <!ENTITY xulrunner-time          "66 SBU">
 ]>
 
@@ -73,12 +73,4 @@
           Estimated build time: &xulrunner-time;
         </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Download</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Optional patch: <ulink
-        url="&patch-root;/firefox-&firefox-version;-system_cairo-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -216,11 +208,4 @@
       </para>
     </note>
-
-    <para>
-      If you are building against a system-installed <application>Cairo</application>
-      apply the patch:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../firefox-&firefox-version;-system_cairo-1.patch</userinput></screen>
 
         <para>
Index: xsoft/graphweb/firefox.xml
===================================================================
--- xsoft/graphweb/firefox.xml	(revision ac87f71665c0b2edf4266b8f88b5935253dc1b66)
+++ xsoft/graphweb/firefox.xml	(revision 1f786063dde3a62b3b0cf48fcb25f2b929b2cf99)
@@ -9,8 +9,8 @@
   <!ENTITY firefox-download-ftp
            "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
-  <!ENTITY firefox-md5sum        "0fa25582fb5e0fba37c9f1add8370af2">
-  <!ENTITY firefox-size          "111 MB">
-  <!ENTITY firefox-buildsize     "4.9 GB (48 MB installed) (or 794 MB and 4.6 MB if using Xulrunner)">
-  <!ENTITY firefox-time          "58 SBU (0.31 SBU if using Xulrunner)">
+  <!ENTITY firefox-md5sum        "06a4c0fe8d3a979aea2fce8d0fdbf328">
+  <!ENTITY firefox-size          "115 MB">
+  <!ENTITY firefox-buildsize     "4.9 GB (48 MB installed) (or 814 MB and 4.6 MB if using Xulrunner)">
+  <!ENTITY firefox-time          "58 SBU (0.47 SBU if using Xulrunner)">
 ]>
 
@@ -78,8 +78,4 @@
         <para>Recommended patch: <ulink
         url="&patch-root;/firefox-&firefox-version;-search_box_fix-1.patch"/></para>
-      </listitem>
-      <listitem>
-        <para>Optional patch: <ulink
-        url="&patch-root;/firefox-&firefox-version;-system_cairo-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -240,11 +236,4 @@
 
 <screen><userinput>patch -Np1 -i ../firefox-&firefox-version;-search_box_fix-1.patch</userinput></screen>
-
-    <para>
-      If you are building against a system-installed <application>Cairo</application>
-      apply the patch:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../firefox-&firefox-version;-system_cairo-1.patch</userinput></screen>
 
     <para>
Index: xsoft/other/icedtea-web.xml
===================================================================
--- xsoft/other/icedtea-web.xml	(revision ac87f71665c0b2edf4266b8f88b5935253dc1b66)
+++ xsoft/other/icedtea-web.xml	(revision 1f786063dde3a62b3b0cf48fcb25f2b929b2cf99)
@@ -7,8 +7,8 @@
   <!ENTITY icedtea-web-download-http "http://icedtea.classpath.org/download/source/icedtea-web-&icedtea-web-version;.tar.gz">
   <!ENTITY icedtea-web-download-ftp  " ">
-  <!ENTITY icedtea-web-md5sum        "97c1d5f02f9a4ab19812a216f39e401a">
-  <!ENTITY icedtea-web-size          "1.3 MB">
-  <!ENTITY icedtea-web-buildsize     "25 MB">
-  <!ENTITY icedtea-web-time          "0.4 SBU">
+  <!ENTITY icedtea-web-md5sum        "a03135f895d60837f6bf7784de0c3914">
+  <!ENTITY icedtea-web-size          "1.4 MB">
+  <!ENTITY icedtea-web-buildsize     "20 MB">
+  <!ENTITY icedtea-web-time          "0.25 SBU">
 ]>
 
@@ -58,14 +58,4 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/icedtea-web-&icedtea-web-version;-imminent_breakage_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
- 
     <bridgehead renderas="sect3">IcedTea-Web Dependencies</bridgehead>
 
@@ -87,7 +77,5 @@
     following commands:</para>
 
-<screen><userinput>patch -Np1 -i ../icedtea-web-&icedtea-web-version;-imminent_breakage_fix-1.patch &amp;&amp;
-
-./configure --prefix=${JAVA_HOME}/jre    \
+<screen><userinput>./configure --prefix=${JAVA_HOME}/jre    \
             --with-jdk-home=${JAVA_HOME} \
             --disable-docs               \
