Index: general.ent
===================================================================
--- general.ent	(revision 5e35878ccf98f08dd1d839354b4a7cb957d2bed0)
+++ general.ent	(revision 7af46e618905ffd9ac00aec6fa8bad1f432d7327)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "27">                   <!-- Always 2 digits -->
+<!ENTITY day          "28">                   <!-- Always 2 digits -->
 <!ENTITY month        "03">                   <!-- Always 2 digits -->
 <!ENTITY year         "2020">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "March 27th, &year;">
+<!ENTITY releasedate  "March 28th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision 5e35878ccf98f08dd1d839354b4a7cb957d2bed0)
+++ general/genlib/genlib.xml	(revision 7af46e618905ffd9ac00aec6fa8bad1f432d7327)
@@ -82,5 +82,5 @@
 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="js52.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="js60.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="js68.xml"/> -->   <!-- will be required by GNOME 3.36 -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="js68.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="json-c.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="json-glib.xml"/>
Index: general/genlib/js68.xml
===================================================================
--- general/genlib/js68.xml	(revision 5e35878ccf98f08dd1d839354b4a7cb957d2bed0)
+++ general/genlib/js68.xml	(revision 7af46e618905ffd9ac00aec6fa8bad1f432d7327)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY js68-download-http "http://ftp.gnome.org/pub/gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-&JS68-version;.tar.bz2">
-  <!ENTITY js68-download-ftp  "ftp://ftp.gnome.org/pub/gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-&JS68-version;.tar.bz2">
-  <!ENTITY js68-md5sum        "cb1ab1983f72d45c737069747c088aa5">
-  <!ENTITY js68-size          "69 MB">
-  <!ENTITY js68-buildsize     "932 MB"> <!-- Installed size is 62 MB -->
-  <!ENTITY js68-time          "6.6 SBU">
+  <!ENTITY js68-download-http "&mozilla-http;/firefox/releases/&JS68-version;esr/source/firefox-&JS68-version;esr.source.tar.xz">
+  <!ENTITY js68-download-ftp  " ">
+  <!ENTITY js68-md5sum        "d21112f6e2b482e3c3ce431682de5e7d">
+  <!ENTITY js68-size          "300 MB">
+  <!ENTITY js68-buildsize     "2.8 GB (30 MB installed)"> <!-- Installed size is 62 MB -->
+  <!ENTITY js68-time          "7.0 SBU">
 ]>
 
@@ -32,6 +32,11 @@
     <para>
       <application>JS</application> is Mozilla's JavaScript engine
-      written in C.
-    </para>
+      written in C. JS68 is taken from Firefox.
+    </para>
+
+    <!-- JS68 is only used by gjs at the moment -->
+
+    <!-- We'll need to remember to update js68 anytime there is a firefox
+         ESR update. -->
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -69,4 +74,5 @@
     </itemizedlist>
 
+    <!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -78,4 +84,5 @@
       </listitem>
     </itemizedlist>
+    -->
 
     <bridgehead renderas="sect3">JS68 Dependencies</bridgehead>
@@ -85,4 +92,5 @@
       <xref linkend="autoconf213"/>,
       <xref linkend="icu"/>,
+      <xref linkend="python2"/>,
       <xref linkend="which"/>,
       <!--<xref linkend="yasm"/>,--> and
@@ -114,4 +122,13 @@
     </caution>
 
+    <note>
+      <para>
+        Unlike most other packages in BLFS, the instructions below require you
+        to untar <filename>firefox-&JS68-version;esr.tar.xz</filename> and
+        change into the <filename>firefox-&JS68-version;</filename> folder.
+      </para>
+    </note>
+
+    <!--
     <para>
       First, apply a patch so we can run the shipped build scripts with
@@ -120,5 +137,5 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../js68-&JS68-version;-python_3-1.patch</userinput></screen>
-
+    -->
     <para>
       Install <application>JS</application> by running the following
@@ -130,6 +147,6 @@
 <screen><userinput>sed '21,+4d' -i js/moz.configure &amp;&amp;
 
-mkdir mozjs-build &amp;&amp;
-cd    mozjs-build &amp;&amp;
+mkdir obj &amp;&amp;
+cd    obj &amp;&amp;
 
 CC=gcc CXX=g++ LLVM_OBJDUMP=/bin/false       \
Index: gnome.ent
===================================================================
--- gnome.ent	(revision 5e35878ccf98f08dd1d839354b4a7cb957d2bed0)
+++ gnome.ent	(revision 7af46e618905ffd9ac00aec6fa8bad1f432d7327)
@@ -16,5 +16,5 @@
 <!-- Chapter 30 -->
 <!-- Platform -->
-<!ENTITY gcr-version                       "3.34.0">
+<!ENTITY gcr-version                       "3.36.0">
 <!ENTITY gsettings-desktop-schemas-version "3.36.0">
 <!ENTITY libsecret-version                 "0.20.1">
@@ -25,7 +25,7 @@
 <!ENTITY GConf-version                     "3.2.6">
 <!ENTITY geocode-glib-version              "3.26.1">
-<!ENTITY gjs-version                       "1.58.5">
+<!ENTITY gjs-version                       "1.64.1">
 <!ENTITY gnome-autoar-version              "0.2.4">
-<!ENTITY gnome-desktop-version             "3.34.4">
+<!ENTITY gnome-desktop-version             "3.36.0">
 <!ENTITY gnome-menus-version               "3.35.3">
 <!ENTITY gnome-online-accounts-version     "3.34.1">
Index: gnome/platform/gcr.xml
===================================================================
--- gnome/platform/gcr.xml	(revision 5e35878ccf98f08dd1d839354b4a7cb957d2bed0)
+++ gnome/platform/gcr.xml	(revision 7af46e618905ffd9ac00aec6fa8bad1f432d7327)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY gcr-download-http "&gnome-download-http;/gcr/&gnome-minor-34;/gcr-&gcr-version;.tar.xz">
-  <!ENTITY gcr-download-ftp  "&gnome-download-ftp;/gcr/&gnome-minor-34;/gcr-&gcr-version;.tar.xz">
-  <!ENTITY gcr-md5sum        "4af28919fb1dd36d93603e8230283b6f">
-  <!ENTITY gcr-size          "1.4 MB">
-  <!ENTITY gcr-buildsize     "88 MB (with tests)">
-  <!ENTITY gcr-time          "0.6 SBU (with tests)">
+  <!ENTITY gcr-download-http "&gnome-download-http;/gcr/&gnome-minor-36;/gcr-&gcr-version;.tar.xz">
+  <!ENTITY gcr-download-ftp  "&gnome-download-ftp;/gcr/&gnome-minor-36;/gcr-&gcr-version;.tar.xz">
+  <!ENTITY gcr-md5sum        "adc65563b6b458507b9a578a8b68fb61">
+  <!ENTITY gcr-size          "1.0 MB">
+  <!ENTITY gcr-buildsize     "47 MB (with tests)">
+  <!ENTITY gcr-time          "0.5 SBU (with tests)">
 ]>
 
@@ -78,6 +78,5 @@
     <para role="required">
       <xref linkend="glib2"/>,
-      <xref linkend="libgcrypt"/>,
-      <xref linkend="libtasn1"/>, and
+      <xref linkend="libgcrypt"/>, and
       <xref linkend="p11-kit"/>
     </para>
@@ -106,4 +105,12 @@
     <title>Installation of Gcr</title>
 
+    <caution>
+      <para>
+        If you are upgrading from a version of gcr prior to 3.36.0, you must
+        run the <filename>remove-la-files.sh</filename> script from the
+        <xref linkend="la-files"/> after installing gcr.
+      </para>
+    </caution>
+
     <para>
       Install <application>Gcr</application> by running the following
@@ -113,10 +120,12 @@
 <screen><userinput>sed -i -r 's:"(/desktop):"/org/gnome\1:' schema/*.xml &amp;&amp;
 
-./configure --prefix=/usr     \
-            --sysconfdir=/etc &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make -k check</command>.
+mkdir gcr-build &amp;&amp;
+cd    gcr-build &amp;&amp;
+
+meson --prefix=/usr -Dgtk_doc=false .. &amp;&amp;
+ninja</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>ninja test</command>.
       The tests must be run from an X Terminal or similar. <!-- One test,
       "test-openssl 3", is known to fail. -->
@@ -127,5 +136,5 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>ninja install</userinput></screen>
   </sect2>
 
@@ -139,5 +148,5 @@
 
     <para>
-      <option>--without-gtk</option>: Use this switch if you
+      <option>-Dgtk=false</option>: Use this switch if you
       haven't installed <xref linkend="gtk3"/>. Note that
       <application>gcr-viewer</application> will not be installed
@@ -145,6 +154,12 @@
     </para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
+    <para>
+      <option>-Dgtk_doc=true</option>: Use this switch if you wish
+      to generate the API reference documentation. Note that you must
+      have <application>GTK-Doc</application>  installed.
+    </para>
+
+    <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>-->
 
   </sect2>
@@ -167,6 +182,6 @@
         <seg>
           /usr/include/gck-1,
-          /usr/{include,share/gtk-doc/html}/gcr-3, and
-          /usr/share/gtk-doc/html/gck
+          /usr/include/gcr-3, and
+          /usr/share/gtk-doc/html/{gcr,gck}
         </seg>
       </seglistitem>
Index: gnome/platform/gjs.xml
===================================================================
--- gnome/platform/gjs.xml	(revision 5e35878ccf98f08dd1d839354b4a7cb957d2bed0)
+++ gnome/platform/gjs.xml	(revision 7af46e618905ffd9ac00aec6fa8bad1f432d7327)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY gjs-download-http "&gnome-download-http;/gjs/1.58/gjs-&gjs-version;.tar.xz">
-  <!ENTITY gjs-download-ftp  "&gnome-download-ftp;/gjs/1.58/gjs-&gjs-version;.tar.xz">
-  <!ENTITY gjs-md5sum        "4e74456ccb16d4cc5004a441f6abbec1">
-  <!ENTITY gjs-size          "624 KB">
-  <!ENTITY gjs-buildsize     "89 MB (with tests)">
-  <!ENTITY gjs-time          "1.0 SBU (with tests)">
+  <!ENTITY gjs-download-http "&gnome-download-http;/gjs/1.64/gjs-&gjs-version;.tar.xz">
+  <!ENTITY gjs-download-ftp  "&gnome-download-ftp;/gjs/1.64/gjs-&gjs-version;.tar.xz">
+  <!ENTITY gjs-md5sum        "8c026b8b683aa1c1d369053de5b752c5">
+  <!ENTITY gjs-size          "412 KB">
+  <!ENTITY gjs-buildsize     "291 MB (with tests)">
+  <!ENTITY gjs-time          "0.7 SBU (with tests)">
 ]>
 
@@ -78,5 +78,5 @@
       <xref linkend="dbus"/>,
       <xref linkend="gobject-introspection"/>, and
-      <xref linkend="js60"/>
+      <xref linkend="js68"/>
     </para>
 
@@ -108,12 +108,15 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
+<screen><userinput>mkdir gjs-build &amp;&amp;
+cd    gjs-build &amp;&amp;
+
+meson --prefix=/usr .. &amp;&amp;
+ninja</userinput></screen>
 
     <para>
-      To test the results, issue: <command>make check</command>. The
+      To test the results, issue: <command>ninja test</command>. The
       <application>GTK</application> and <application>Cairo</application>
-      tests will fail if not running in an Xorg session. Two tests related
-      to testCommandLine.sh (6 and 7) are known to fail.
+      tests will fail if not running in an Xorg session. One test,
+      <filename>gjs: Scripts/CommandLine</filename>, is known to fail.
       <!-- Still fails with 1.58.5. -->
     </para>
@@ -123,5 +126,5 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>ninja install</userinput></screen>
 
   </sect2>
@@ -144,6 +147,8 @@
         <seg>
           /usr/include/gjs-1.0,
-          /usr/lib/gjs, and
-          /usr/share/gjs-1.0
+          /usr/lib/gjs,
+          /usr/libexec/gjs,
+          /usr/share/gjs-1.0, and
+          /usr/share/installed-tests/gjs
         </seg>
       </seglistitem>
Index: gnome/platform/gnome-desktop.xml
===================================================================
--- gnome/platform/gnome-desktop.xml	(revision 5e35878ccf98f08dd1d839354b4a7cb957d2bed0)
+++ gnome/platform/gnome-desktop.xml	(revision 7af46e618905ffd9ac00aec6fa8bad1f432d7327)
@@ -5,11 +5,11 @@
   %general-entities;
 
-<!ENTITY gnome-desktop-download-http
-           "&gnome-download-http;/gnome-desktop/&gnome-minor-34;/gnome-desktop-&gnome-desktop-version;.tar.xz">
+  <!ENTITY gnome-desktop-download-http
+           "&gnome-download-http;/gnome-desktop/&gnome-minor-36;/gnome-desktop-&gnome-desktop-version;.tar.xz">
   <!ENTITY gnome-desktop-download-ftp
-           "&gnome-download-ftp;/gnome-desktop/&gnome-minor-34;/gnome-desktop-&gnome-desktop-version;.tar.xz">
-  <!ENTITY gnome-desktop-md5sum        "d682a05eb98bb2dd434042b6ac4f99d5">
-  <!ENTITY gnome-desktop-size          "700 KB">
-  <!ENTITY gnome-desktop-buildsize     "19 MB (with tests)">
+           "&gnome-download-ftp;/gnome-desktop/&gnome-minor-36;/gnome-desktop-&gnome-desktop-version;.tar.xz">
+  <!ENTITY gnome-desktop-md5sum        "7f845b623de47dc6a6496ebcc59ac7ca">
+  <!ENTITY gnome-desktop-size          "724 KB">
+  <!ENTITY gnome-desktop-buildsize     "20 MB (with tests)">
   <!ENTITY gnome-desktop-time          "0.1 SBU (Using parallelism=4; with tests)">
 ]>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 5e35878ccf98f08dd1d839354b4a7cb957d2bed0)
+++ introduction/welcome/changelog.xml	(revision 7af46e618905ffd9ac00aec6fa8bad1f432d7327)
@@ -43,4 +43,27 @@
     -->
     <listitem>
+      <para>March 28th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to gcr-3.36.0. Part of
+          <ulink url="&blfs-ticket-root;13241">#13241</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-desktop-3.36.0. Part of
+          <ulink url="&blfs-ticket-root;13241">#13241</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gjs-1.64.1. Part of
+          <ulink url="&blfs-ticket-root;13241">#13241</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Add JS68 to the book. Fixes
+          <ulink url="&blfs-ticket-root;13111">#13111</ulink>.
+          Credit goes to Xi for crafting the page.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>March 27th, 2020</para>
       <itemizedlist>
Index: packages.ent
===================================================================
--- packages.ent	(revision 5e35878ccf98f08dd1d839354b4a7cb957d2bed0)
+++ packages.ent	(revision 7af46e618905ffd9ac00aec6fa8bad1f432d7327)
@@ -118,5 +118,5 @@
 <!--<!ENTITY JS52-version                 "52.2.1gnome1">-->
 <!ENTITY JS60-version                 "60.8.0">
-<!ENTITY JS68-version                 "68.4.2">
+<!ENTITY JS68-version                 "68.6.0">
 <!ENTITY json-c-version               "0.13.1">
 <!ENTITY json-glib-version            "1.4.4">
