Index: gnome/platform/gcr.xml
===================================================================
--- gnome/platform/gcr.xml	(revision 9bd10279bcf111ebee7c4b7c9cd7806400517bfc)
+++ gnome/platform/gcr.xml	(revision 2e4d847e04508e63724cf58f62bd24705d504dd2)
@@ -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 9bd10279bcf111ebee7c4b7c9cd7806400517bfc)
+++ gnome/platform/gjs.xml	(revision 2e4d847e04508e63724cf58f62bd24705d504dd2)
@@ -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 9bd10279bcf111ebee7c4b7c9cd7806400517bfc)
+++ gnome/platform/gnome-desktop.xml	(revision 2e4d847e04508e63724cf58f62bd24705d504dd2)
@@ -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)">
 ]>
