Index: general/genlib/json-glib.xml
===================================================================
--- general/genlib/json-glib.xml	(revision 7c9f956257d6c9f193fa17aff080079f80639c32)
+++ general/genlib/json-glib.xml	(revision 7e9db78cf7972c3aa0985ce4f4299d2d8df0138b)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY json-glib-download-http "&gnome-download-http;/json-glib/1.2/json-glib-&json-glib-version;.tar.xz">
-  <!ENTITY json-glib-download-ftp  "&gnome-download-ftp;/json-glib/1.2/json-glib-&json-glib-version;.tar.xz">
-  <!ENTITY json-glib-md5sum        "ff31e7d0594df44318e12facda3d086e">
-  <!ENTITY json-glib-size          "592 KB">
-  <!ENTITY json-glib-buildsize     "13 MB (with tests)">
-  <!ENTITY json-glib-time          "0.1 SBU (with tests)">
+  <!ENTITY json-glib-download-http "&gnome-download-http;/json-glib/1.4/json-glib-&json-glib-version;.tar.xz">
+  <!ENTITY json-glib-download-ftp  "&gnome-download-ftp;/json-glib/1.4/json-glib-&json-glib-version;.tar.xz">
+  <!ENTITY json-glib-md5sum        "35107e23a7bbbc70f31c34f7b9adf1c3">
+  <!ENTITY json-glib-size          "164 KB">
+  <!ENTITY json-glib-buildsize     "8.6 MB (with tests)">
+  <!ENTITY json-glib-time          "less than 0.1 SBU (with tests)">
 ]>
 
@@ -102,9 +102,11 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
+<screen><userinput>mkdir build &amp;&amp;
+cd build &amp;&amp;
+meson --prefix /usr .. &amp;&amp;
+ninja</userinput></screen>
 
     <para>
-      To test the results, issue: <command>make check</command>.
+      To test the results, issue: <command>ninja test</command>.
     </para>
 
@@ -113,13 +115,5 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
+<screen role="root"><userinput>ninja install</userinput></screen>
 
   </sect2>
Index: gnome.ent
===================================================================
--- gnome.ent	(revision 7c9f956257d6c9f193fa17aff080079f80639c32)
+++ gnome.ent	(revision 7e9db78cf7972c3aa0985ce4f4299d2d8df0138b)
@@ -22,4 +22,5 @@
 <!ENTITY yelp-xsl-version                  "3.20.1">
 <!ENTITY GConf-version                     "3.2.6">
+<!ENTITY geocode-glib-version              "3.25.4.1">
 <!ENTITY gjs-version                       "1.50.1">
 <!ENTITY gnome-autoar-version              "0.2.2">
@@ -29,5 +30,4 @@
 <!ENTITY libpeas-version                   "1.20.0">
 <!ENTITY libwnck-version                   "3.24.1">
-<!ENTITY geocode-glib-version              "3.24.0">
 <!ENTITY gnome-online-accounts-version     "3.24.3">
 <!ENTITY gnome-menus-version               "3.13.3">
Index: gnome/platform/geocode-glib.xml
===================================================================
--- gnome/platform/geocode-glib.xml	(revision 7c9f956257d6c9f193fa17aff080079f80639c32)
+++ gnome/platform/geocode-glib.xml	(revision 7e9db78cf7972c3aa0985ce4f4299d2d8df0138b)
@@ -6,10 +6,10 @@
 
   <!ENTITY geocode-glib-download-http
-           "&gnome-download-http;/geocode-glib/&gnome-minor-24;/geocode-glib-&geocode-glib-version;.tar.xz">
+           "&gnome-download-http;/geocode-glib/3.25/geocode-glib-&geocode-glib-version;.tar.xz">
   <!ENTITY geocode-glib-download-ftp
-           "&gnome-download-ftp;/geocode-glib/&gnome-minor-24;/geocode-glib-&geocode-glib-version;.tar.xz">
-  <!ENTITY geocode-glib-md5sum        "9defe9329b13cdf44bcc31618c97d66e">
-  <!ENTITY geocode-glib-size          "404 KB">
-  <!ENTITY geocode-glib-buildsize     "6.4 MB (with tests)">
+           "&gnome-download-ftp;/geocode-glib/3.25/geocode-glib-&geocode-glib-version;.tar.xz">
+  <!ENTITY geocode-glib-md5sum        "7315e7ff162dfd01165ba8a284e3eda6">
+  <!ENTITY geocode-glib-size          "80 KB">
+  <!ENTITY geocode-glib-buildsize     "2.3 MB (with tests)">
   <!ENTITY geocode-glib-time          "less than 0.1 SBU (with tests)">
 ]>
@@ -90,5 +90,4 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="git"/> and
       <xref linkend="gtk-doc"/>
     </para>
@@ -102,12 +101,4 @@
     <title>Installation of Geocode GLib</title>
 
-<!--
-    <para>
-      First, apply a patch to fix the Makefile to not complain about nonexistent icons.
-    </para>
-
-<screen><userinput>patch -Np1 -i ../geocode-glib-&geocode-glib-version;-fix_icon_installation-1.patch</userinput></screen>
--->
-
     <para>
       Install <application>Geocode GLib</application> by running the following
@@ -115,10 +106,12 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
+<screen><userinput>mkdir build &amp;&amp;
+cd build &amp;&amp;
+meson --prefix /usr .. &amp;&amp;
+ninja</userinput></screen>
 
 
     <para>
-      To test the results, issue: <command>make -k check</command>. <!-- Note that
+      To test the results, issue: <command>ninja test</command>. <!-- Note that
       at least one test is known to fail for unknown reasons. -->
     </para>
@@ -128,13 +121,5 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
+<screen role="root"><userinput>ninja install</userinput></screen>
 
   </sect2>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 7c9f956257d6c9f193fa17aff080079f80639c32)
+++ introduction/welcome/changelog.xml	(revision 7e9db78cf7972c3aa0985ce4f4299d2d8df0138b)
@@ -47,4 +47,10 @@
       <itemizedlist>
         <listitem>
+          <para>[dj] - Update to geocode-glib-3.25.4.1.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to json-glib-1.4.2.</para>
+        </listitem>
+        <listitem>
           <para>[dj] - Update to VTE-0.50.1.</para>
         </listitem>
Index: packages.ent
===================================================================
--- packages.ent	(revision 7c9f956257d6c9f193fa17aff080079f80639c32)
+++ packages.ent	(revision 7e9db78cf7972c3aa0985ce4f4299d2d8df0138b)
@@ -122,5 +122,5 @@
 <!ENTITY JS52-version                 "52.2.1gnome1">
 <!ENTITY json-c-version               "0.12.1">
-<!ENTITY json-glib-version            "1.2.8">
+<!ENTITY json-glib-version            "1.4.2">
 <!ENTITY keyutils-version             "1.5.10">
 <!ENTITY libarchive-version           "3.3.2">
