Index: general/prog/gcc-ada.xml
===================================================================
--- general/prog/gcc-ada.xml	(revision 6c29fefb29cf609d02c908e7409812427ade7ff5)
+++ general/prog/gcc-ada.xml	(revision bed22861684c6e83489fe3b23659c249b9b286b5)
@@ -7,8 +7,8 @@
   <!ENTITY gcc-download-http     "http://ftpmirror.gnu.org/gcc/gcc-&gcc-ada-version;/gcc-&gcc-ada-version;.tar.bz2">
   <!ENTITY gcc-download-ftp      "ftp://ftp.gnu.org/gnu/gcc/gcc-&gcc-ada-version;/gcc-&gcc-ada-version;.tar.bz2">
-  <!ENTITY gcc-md5sum            "c9616fd448f980259c31de613e575719">
-  <!ENTITY gcc-size              "92 MB">
-  <!ENTITY gcc-ada-buildsize     "6.9 GB (0.9 GB added if GNAT install dir is not removed)">
-  <!ENTITY gcc-ada-time          "136 SBU (including 77 SBU for tests)">
+  <!ENTITY gcc-md5sum            "8fb6cb98b8459f5863328380fbf06bd1">
+  <!ENTITY gcc-size              "95 MB">
+  <!ENTITY gcc-ada-buildsize     "8.4 GB (0.9 GB added if GNAT install dir is not removed)">
+  <!ENTITY gcc-ada-time          "48 SBU (with tests and parallelism=4)">
 
   <!ENTITY gnat-download-http    "https://libre.adacore.com/download/">
Index: general/prog/gcc-java.xml
===================================================================
--- general/prog/gcc-java.xml	(revision 6c29fefb29cf609d02c908e7409812427ade7ff5)
+++ general/prog/gcc-java.xml	(revision bed22861684c6e83489fe3b23659c249b9b286b5)
@@ -7,10 +7,11 @@
   <!ENTITY gcc-java-download-http  "http://ftpmirror.gnu.org/gcc/gcc-&gcc-java-version;/gcc-&gcc-java-version;.tar.bz2">
   <!ENTITY gcc-java-download-ftp   "ftp://ftp.gnu.org/gnu/gcc/gcc-&gcc-java-version;/gcc-&gcc-java-version;.tar.bz2">
-  <!ENTITY gcc-java-md5sum         "c9616fd448f980259c31de613e575719">
-  <!ENTITY gcc-java-size           "92 MB">
-  <!ENTITY gcc-java-buildsize      "4.1 GB">
-  <!ENTITY gcc-java-time           "86 SBU (including 72 SBU for tests)">
-
-  <!ENTITY ecj-download-ftp    "ftp://sourceware.org/pub/java/ecj-latest.jar">
+  <!ENTITY gcc-java-md5sum         "8fb6cb98b8459f5863328380fbf06bd1">
+  <!ENTITY gcc-java-size           "95 MB">
+  <!ENTITY gcc-java-buildsize      "5 GB">
+  <!ENTITY gcc-java-time           "29 SBU (with tests and parallelism=4)">
+
+<!-- ecj-latest points to 4.5 while ecj-4.9 is available -->
+  <!ENTITY ecj-download-ftp    "ftp://sourceware.org/pub/java/ecj-4.9.jar">
 
   <!ENTITY antlr-version       "4.5.1">
@@ -157,6 +158,8 @@
 <screen><userinput>sed -i 's/\(install.*:\) install-.*recursive/\1/' libffi/Makefile.in         &amp;&amp;
 sed -i 's/\(install-data-am:\).*/\1/'             libffi/include/Makefile.in &amp;&amp;
-
-cp ../ecj-latest.jar ./ecj.jar &amp;&amp;
+sed -i 's/absolute/file normalize/' libjava/testsuite/lib/libjava.exp &amp;&amp;
+sed -i 's/major.*1000.*minor/major/' gcc/java/decl.c &amp;&amp;
+
+cp ../ecj-4.9.jar ./ecj.jar &amp;&amp;
 
 mkdir build &amp;&amp;
@@ -218,8 +221,13 @@
 
     <para>
-      The two <command>sed</command> commands prevent the
+      The first two <command>sed</command> commands prevent the
       installation of the <application>libffi</application> library bundled
       with <application>GCC</application>, since it is outdated compared to
       <xref linkend="libffi"/>.
+    </para>
+
+    <para>
+      The next two <command>sed</command> commands implement upstream fixes
+      to the <application>GCC Java</application> compiler and tests.
     </para>
 
@@ -298,7 +306,7 @@
       /usr/lib/gcc/*linux-gnu/...</command>:
       If the package is built by a user other than root, the ownership of the
-      installed <filename class="directory">include</filename> directory (and its
-      content) will be incorrect. This commands changes the ownership to the
-      <systemitem class="username">root</systemitem> user and group.
+      installed <filename class="directory">include</filename> directory (and
+      its content) will be incorrect. This commands changes the ownership to
+      the <systemitem class="username">root</systemitem> user and group.
     </para>
 
Index: general/prog/gcc.xml
===================================================================
--- general/prog/gcc.xml	(revision 6c29fefb29cf609d02c908e7409812427ade7ff5)
+++ general/prog/gcc.xml	(revision bed22861684c6e83489fe3b23659c249b9b286b5)
@@ -7,8 +7,8 @@
   <!ENTITY gcc-download-http  "http://ftpmirror.gnu.org/gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
   <!ENTITY gcc-download-ftp   "ftp://ftp.gnu.org/gnu/gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
-  <!ENTITY gcc-md5sum         "c9616fd448f980259c31de613e575719">
-  <!ENTITY gcc-size           "92 MB">
-  <!ENTITY gcc-buildsize      "7.2 GB (with tests)">
-  <!ENTITY gcc-time           "45.7 SBU (with tests and parallelism=4)">
+  <!ENTITY gcc-md5sum         "8fb6cb98b8459f5863328380fbf06bd1">
+  <!ENTITY gcc-size           "95 MB">
+  <!ENTITY gcc-buildsize      "8.4 GB (with tests)">
+  <!ENTITY gcc-time           "46 SBU (with tests and parallelism=4)">
 ]>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 6c29fefb29cf609d02c908e7409812427ade7ff5)
+++ introduction/welcome/changelog.xml	(revision bed22861684c6e83489fe3b23659c249b9b286b5)
@@ -48,4 +48,8 @@
       <itemizedlist>
         <listitem>
+          <para>[pierre] - Update to GCC-6.1.0 Fixes
+          <ulink url="&blfs-ticket-root;7773">#7773</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[igor] - Update to hexchat-2.12.1. Fixes
           <ulink url="&blfs-ticket-root;7788">#7788</ulink>.</para>
Index: packages.ent
===================================================================
--- packages.ent	(revision 6c29fefb29cf609d02c908e7409812427ade7ff5)
+++ packages.ent	(revision bed22861684c6e83489fe3b23659c249b9b286b5)
@@ -264,7 +264,7 @@
 <!ENTITY elfutils-version             "0.166">
 <!ENTITY expect-version               "5.45">
-<!ENTITY gcc-version                  "5.3.0">
-<!ENTITY gcc-java-version             "5.3.0">
-<!ENTITY gcc-ada-version              "5.3.0">
+<!ENTITY gcc-version                  "6.1.0">
+<!ENTITY gcc-java-version             "6.1.0">
+<!ENTITY gcc-ada-version              "6.1.0">
 <!ENTITY gc-version                   "7.4.2">
 <!ENTITY gdb-version                  "7.11">
