Index: gnome.ent
===================================================================
--- gnome.ent	(revision 4d59e9e6686220ce033a9db4b29f082be36b06b4)
+++ gnome.ent	(revision eb305e7ba1fd58392d510baf700549239a7a78ff)
@@ -77,24 +77,24 @@
 <!-- Chapter 31 -->
 <!-- Applications -->
-<!ENTITY baobab-version                    "3.38.0">
+<!ENTITY baobab-version                    "40.0">
 <!ENTITY brasero-version                   "3.12.2">
 <!ENTITY cheese-version                    "3.38.0">
-<!ENTITY eog-version                       "3.38.2">
-<!ENTITY evince-version                    "3.38.2">
+<!ENTITY eog-version                       "40.0">
+<!ENTITY evince-version                    "40.1">
 <!ENTITY evolution-version                 "3.40.0">
 <!ENTITY file-roller-version               "3.38.0">
 <!-- gedit moved to Editors, so it's now in packages.ent -->
-<!ENTITY gnome-calculator-version          "3.38.2">
+<!ENTITY gnome-calculator-version          "40.0">
 <!ENTITY gnome-color-manager-version       "3.36.0">
-<!ENTITY gnome-disk-utility-version        "3.38.2">
+<!ENTITY gnome-disk-utility-version        "40.0">
 <!ENTITY gnome-logs-version                "3.36.0">
-<!ENTITY gnome-maps-version                "3.38.4">
+<!ENTITY gnome-maps-version                "40.0">
 <!ENTITY gnome-nettool-version             "3.8.1">
 <!ENTITY gnome-power-manager-version       "3.32.0">
-<!ENTITY gnome-screenshot-version          "3.38.0">
-<!ENTITY gnome-system-monitor-version      "3.38.0">
-<!ENTITY gnome-terminal-version            "3.38.3">
+<!ENTITY gnome-screenshot-version          "40.0">
+<!ENTITY gnome-system-monitor-version      "40.0">
+<!ENTITY gnome-terminal-version            "3.40.0">
 <!ENTITY gnome-tweaks-version              "40.0">
-<!ENTITY gnome-weather-version             "3.36.1">
+<!ENTITY gnome-weather-version             "40.0">
 <!ENTITY gucharmap-version                 "12.0.1">
 <!-- nm-applet moved to Networking Utilities, so it's now in packages.ent -->
Index: gnome/applications/baobab.xml
===================================================================
--- gnome/applications/baobab.xml	(revision 4d59e9e6686220ce033a9db4b29f082be36b06b4)
+++ gnome/applications/baobab.xml	(revision eb305e7ba1fd58392d510baf700549239a7a78ff)
@@ -5,8 +5,8 @@
   %general-entities;
 
-  <!ENTITY baobab-download-http "&gnome-download-http;/baobab/&gnome-minor-38;/baobab-&baobab-version;.tar.xz">
-  <!ENTITY baobab-download-ftp  "&gnome-download-ftp;/baobab/&gnome-minor-38;/baobab-&baobab-version;.tar.xz">
-  <!ENTITY baobab-md5sum        "b69c1e9e4711d15367b894f63d2081e8">
-  <!ENTITY baobab-size          "568 KB">
+  <!ENTITY baobab-download-http "&gnome-download-http;/baobab/&gnome-40;/baobab-&baobab-version;.tar.xz">
+  <!ENTITY baobab-download-ftp  "&gnome-download-ftp;/baobab/&gnome-40;/baobab-&baobab-version;.tar.xz">
+  <!ENTITY baobab-md5sum        "7b95ce82fa0607104fee9da78f3b17c7">
+  <!ENTITY baobab-size          "572 KB">
   <!ENTITY baobab-buildsize     "13 MB">
   <!ENTITY baobab-time          "0.1 SBU (Using parallelism=4)">
@@ -77,5 +77,6 @@
       <xref linkend="adwaita-icon-theme"/>,
       <xref linkend="gtk3"/>,
-      <xref linkend="itstool"/> and
+      <xref linkend="itstool"/>,
+      <xref linkend="libhandy1"/>, and
       <xref linkend="vala"/>
     </para>
Index: gnome/applications/cheese.xml
===================================================================
--- gnome/applications/cheese.xml	(revision 4d59e9e6686220ce033a9db4b29f082be36b06b4)
+++ gnome/applications/cheese.xml	(revision eb305e7ba1fd58392d510baf700549239a7a78ff)
@@ -70,5 +70,5 @@
       </listitem>
     </itemizedlist>
-<!--
+
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -76,9 +76,9 @@
         <para>
           Required patch:
-		  <ulink url="&patch-root;/cheese-&cheese-version;-gst_debug_disabled-1.patch"/>
+		  <ulink url="&patch-root;/cheese-&cheese-version;-upstream_fixes-1.patch"/>
         </para>
       </listitem>
     </itemizedlist>
--->
+
     <bridgehead renderas="sect3">Cheese Dependencies</bridgehead>
 
@@ -145,4 +145,10 @@
 
 <screen><userinput>sed -i "s/&amp;version;/&cheese-version;/" docs/reference/cheese{,-docs}.xml</userinput></screen>
+
+    <para>
+      Next, fix some build issues due to removed Vala functions:
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../cheese-&cheese-version;-upstream_fixes-1.patch</userinput></screen>
 
     <para>
Index: gnome/applications/eog.xml
===================================================================
--- gnome/applications/eog.xml	(revision 4d59e9e6686220ce033a9db4b29f082be36b06b4)
+++ gnome/applications/eog.xml	(revision eb305e7ba1fd58392d510baf700549239a7a78ff)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY eog-download-http "&gnome-download-http;/eog/&gnome-minor-38;/eog-&eog-version;.tar.xz">
-  <!ENTITY eog-download-ftp  "&gnome-download-ftp;/eog/&gnome-minor-38;/eog-&eog-version;.tar.xz">
-  <!ENTITY eog-md5sum        "49cfecae134e09c32b78843a2acf01f5">
+  <!ENTITY eog-download-http "&gnome-download-http;/eog/&gnome-40;/eog-&eog-version;.tar.xz">
+  <!ENTITY eog-download-ftp  "&gnome-download-ftp;/eog/&gnome-40;/eog-&eog-version;.tar.xz">
+  <!ENTITY eog-md5sum        "9713a3dbd0b25264f47aca9a85508b12">
   <!ENTITY eog-size          "3.4 MB">
-  <!ENTITY eog-buildsize     "48 MB">
+  <!ENTITY eog-buildsize     "47 MB">
   <!ENTITY eog-time          "0.3 SBU">
 ]>
@@ -151,5 +151,5 @@
 
     <para>
-      <option>-Dgtk-doc=true</option>: Use this option if
+      <option>-Dgtk_doc=true</option>: Use this option if
       <xref role="nodep" linkend="gtk-doc"/> is installed and you wish to rebuild
       and install the API documentation.
Index: gnome/applications/evince.xml
===================================================================
--- gnome/applications/evince.xml	(revision 4d59e9e6686220ce033a9db4b29f082be36b06b4)
+++ gnome/applications/evince.xml	(revision eb305e7ba1fd58392d510baf700549239a7a78ff)
@@ -6,10 +6,10 @@
 
   <!ENTITY evince-download-http
-     "&gnome-download-http;/evince/&gnome-minor-38;/evince-&evince-version;.tar.xz">
+     "&gnome-download-http;/evince/&gnome-40;/evince-&evince-version;.tar.xz">
   <!ENTITY evince-download-ftp
-     "&gnome-download-ftp;/evince/&gnome-minor-38;/evince-&evince-version;.tar.xz">
-  <!ENTITY evince-md5sum        "497863ba00e1b2906c846d6d6c90a8e7">
+     "&gnome-download-ftp;/evince/&gnome-40;/evince-&evince-version;.tar.xz">
+  <!ENTITY evince-md5sum        "89b9c52d6fd03ffb244abc12a989d1ec">
   <!ENTITY evince-size          "2.8 MB">
-  <!ENTITY evince-buildsize     "85 MB">
+  <!ENTITY evince-buildsize     "84 MB">
   <!ENTITY evince-time          "0.4 SBU (Using parallelism=4)">
 ]>
@@ -84,4 +84,5 @@
       <xref linkend="gtk3"/>,
       <xref linkend="itstool"/>,
+      <xref linkend="libhandy1"/>,
       <xref linkend="libxml2"/>, and
       <xref linkend="openjpeg2"/>
Index: gnome/applications/gnome-calculator.xml
===================================================================
--- gnome/applications/gnome-calculator.xml	(revision 4d59e9e6686220ce033a9db4b29f082be36b06b4)
+++ gnome/applications/gnome-calculator.xml	(revision eb305e7ba1fd58392d510baf700549239a7a78ff)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-calculator-download-http
-           "&gnome-download-http;/gnome-calculator/&gnome-minor-38;/gnome-calculator-&gnome-calculator-version;.tar.xz">
+           "&gnome-download-http;/gnome-calculator/&gnome-40;/gnome-calculator-&gnome-calculator-version;.tar.xz">
   <!ENTITY gnome-calculator-download-ftp
-           "&gnome-download-ftp;/gnome-calculator/&gnome-minor-38;/gnome-calculator-&gnome-calculator-version;.tar.xz">
-  <!ENTITY gnome-calculator-md5sum        "c634eae25fd365c61c31a20052fe0ea5">
-  <!ENTITY gnome-calculator-size          "984 KB">
-  <!ENTITY gnome-calculator-buildsize     "53 MB (with tests)">
+           "&gnome-download-ftp;/gnome-calculator/&gnome-40;/gnome-calculator-&gnome-calculator-version;.tar.xz">
+  <!ENTITY gnome-calculator-md5sum        "ba256c362b6ba5bfc0792ebeb0fb6a59">
+  <!ENTITY gnome-calculator-size          "1000 KB">
+  <!ENTITY gnome-calculator-buildsize     "62 MB (with tests)">
   <!ENTITY gnome-calculator-time          "0.3 SBU (with tests)">
 ]>
@@ -82,5 +82,6 @@
       <xref linkend="gtksourceview4"/>, 
       <xref linkend="itstool"/>, 
-      <xref linkend="libgee"/>, and
+      <xref linkend="libgee"/>,
+      <xref linkend="libhandy1"/>, and
       <xref linkend="libsoup"/>
     </para>
@@ -148,5 +149,6 @@
         <seg>
           /usr/include/gcalc-2,
-          /usr/include/gci-2, and
+          /usr/include/gci-2,
+          /usr/share/devhelp/books/{GCalc-2,GCi-1}, and
           /usr/share/help/*/gnome-calculator
         </seg>
Index: gnome/applications/gnome-disk-utility.xml
===================================================================
--- gnome/applications/gnome-disk-utility.xml	(revision 4d59e9e6686220ce033a9db4b29f082be36b06b4)
+++ gnome/applications/gnome-disk-utility.xml	(revision eb305e7ba1fd58392d510baf700549239a7a78ff)
@@ -6,8 +6,8 @@
 
   <!ENTITY gnome-disk-utility-download-http
-           "&gnome-download-http;/gnome-disk-utility/&gnome-minor-38;/gnome-disk-utility-&gnome-disk-utility-version;.tar.xz">
+           "&gnome-download-http;/gnome-disk-utility/&gnome-40;/gnome-disk-utility-&gnome-disk-utility-version;.tar.xz">
   <!ENTITY gnome-disk-utility-download-ftp
-           "&gnome-download-ftp;/gnome-disk-utility/&gnome-minor-38;/gnome-disk-utility-&gnome-disk-utility-version;.tar.xz">
-  <!ENTITY gnome-disk-utility-md5sum        "3b4130ef1399d26c385ab03e22f79a3e">
+           "&gnome-download-ftp;/gnome-disk-utility/&gnome-40;/gnome-disk-utility-&gnome-disk-utility-version;.tar.xz">
+  <!ENTITY gnome-disk-utility-md5sum        "49a9fbc56be0dd5693b0ed535924471b">
   <!ENTITY gnome-disk-utility-size          "1.3 MB">
   <!ENTITY gnome-disk-utility-buildsize     "36 MB">
@@ -80,4 +80,5 @@
       <xref linkend="itstool"/>,
       <xref linkend="libdvdread"/>,
+      <xref linkend="libhandy1"/>,
       <xref linkend="libpwquality"/>,
       <xref linkend="libsecret"/>, and
Index: gnome/applications/gnome-maps.xml
===================================================================
--- gnome/applications/gnome-maps.xml	(revision 4d59e9e6686220ce033a9db4b29f082be36b06b4)
+++ gnome/applications/gnome-maps.xml	(revision eb305e7ba1fd58392d510baf700549239a7a78ff)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-maps-download-http
-           "&gnome-download-http;/gnome-maps/&gnome-minor-38;/gnome-maps-&gnome-maps-version;.tar.xz">
+           "&gnome-download-http;/gnome-maps/&gnome-40;/gnome-maps-&gnome-maps-version;.tar.xz">
   <!ENTITY gnome-maps-download-ftp
-           "&gnome-download-ftp;/gnome-maps/&gnome-minor-38;/gnome-maps-&gnome-maps-version;.tar.xz">
-  <!ENTITY gnome-maps-md5sum        "0a9019411b8acb8f4dd1a43c40a3fac2">
-  <!ENTITY gnome-maps-size          "3.8 MB">
-  <!ENTITY gnome-maps-buildsize     "17 MB">
+           "&gnome-download-ftp;/gnome-maps/&gnome-40;/gnome-maps-&gnome-maps-version;.tar.xz">
+  <!ENTITY gnome-maps-md5sum        "d48b18e28bae6b466350c69b74b9cccd">
+  <!ENTITY gnome-maps-size          "3.4 MB">
+  <!ENTITY gnome-maps-buildsize     "16 MB">
   <!ENTITY gnome-maps-time          "0.1 SBU">
 ]>
@@ -78,4 +78,5 @@
     <para role="required">
       <xref linkend="clutter-gtk"/>,
+      <xref linkend="desktop-file-utils"/>,
       <xref linkend="folks"/>,
       <xref linkend="geoclue2"/>,
@@ -84,5 +85,6 @@
       <xref linkend="gjs"/>,
       <xref linkend="libchamplain"/>,
-      <xref linkend="libgee"/>, and
+      <xref linkend="libgee"/>,
+      <xref linkend="libhandy1"/>, and
       <xref linkend="rest"/>
     </para>
Index: gnome/applications/gnome-screenshot.xml
===================================================================
--- gnome/applications/gnome-screenshot.xml	(revision 4d59e9e6686220ce033a9db4b29f082be36b06b4)
+++ gnome/applications/gnome-screenshot.xml	(revision eb305e7ba1fd58392d510baf700549239a7a78ff)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-screenshot-download-http
-           "&gnome-download-http;/gnome-screenshot/&gnome-minor-38;/gnome-screenshot-&gnome-screenshot-version;.tar.xz">
+           "&gnome-download-http;/gnome-screenshot/&gnome-40;/gnome-screenshot-&gnome-screenshot-version;.tar.xz">
   <!ENTITY gnome-screenshot-download-ftp
-           "&gnome-download-ftp;/gnome-screenshot/&gnome-minor-38;/gnome-screenshot-&gnome-screenshot-version;.tar.xz">
-  <!ENTITY gnome-screenshot-md5sum        "6550491108355c9d991e90b735ef3908">
+           "&gnome-download-ftp;/gnome-screenshot/&gnome-40;/gnome-screenshot-&gnome-screenshot-version;.tar.xz">
+  <!ENTITY gnome-screenshot-md5sum        "9300f1ef8edd9f1ec7903c4121dea247">
   <!ENTITY gnome-screenshot-size          "352 KB">
-  <!ENTITY gnome-screenshot-buildsize     "6.6 MB">
+  <!ENTITY gnome-screenshot-buildsize     "6.5 MB">
   <!ENTITY gnome-screenshot-time          "less than 0.1 SBU">
 ]>
Index: gnome/applications/gnome-system-monitor.xml
===================================================================
--- gnome/applications/gnome-system-monitor.xml	(revision 4d59e9e6686220ce033a9db4b29f082be36b06b4)
+++ gnome/applications/gnome-system-monitor.xml	(revision eb305e7ba1fd58392d510baf700549239a7a78ff)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-system-monitor-download-http
-           "&gnome-download-http;/gnome-system-monitor/&gnome-minor-38;/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
+           "&gnome-download-http;/gnome-system-monitor/&gnome-40;/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
   <!ENTITY gnome-system-monitor-download-ftp
-           "&gnome-download-ftp;/gnome-system-monitor/&gnome-minor-38;/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
-  <!ENTITY gnome-system-monitor-md5sum        "0494ca62d2d59b5de5efc2eddef58463">
-  <!ENTITY gnome-system-monitor-size          "696 KB">
-  <!ENTITY gnome-system-monitor-buildsize     "32 MB">
+           "&gnome-download-ftp;/gnome-system-monitor/&gnome-40;/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
+  <!ENTITY gnome-system-monitor-md5sum        "ac3cedfd5a61fbbecd1a2f05d8728de4">
+  <!ENTITY gnome-system-monitor-size          "748 KB">
+  <!ENTITY gnome-system-monitor-buildsize     "35 MB">
   <!ENTITY gnome-system-monitor-time          "0.2 SBU (with parallelism=4)">
 ]>
Index: gnome/applications/gnome-terminal.xml
===================================================================
--- gnome/applications/gnome-terminal.xml	(revision 4d59e9e6686220ce033a9db4b29f082be36b06b4)
+++ gnome/applications/gnome-terminal.xml	(revision eb305e7ba1fd58392d510baf700549239a7a78ff)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-terminal-download-http
-           "&gnome-download-http;/gnome-terminal/&gnome-minor-38;/gnome-terminal-&gnome-terminal-version;.tar.xz">
+           "&gnome-download-http;/gnome-terminal/&gnome-minor-40;/gnome-terminal-&gnome-terminal-version;.tar.xz">
   <!ENTITY gnome-terminal-download-ftp
-           "&gnome-download-ftp;/gnome-terminal/&gnome-minor-38;/gnome-terminal-&gnome-terminal-version;.tar.xz">
-  <!ENTITY gnome-terminal-md5sum        "cef7deb6780f493a4c510cef3984c34f">
+           "&gnome-download-ftp;/gnome-terminal/&gnome-minor-40;/gnome-terminal-&gnome-terminal-version;.tar.xz">
+  <!ENTITY gnome-terminal-md5sum        "8cd60c510a670355f062b9524a30dcba">
   <!ENTITY gnome-terminal-size          "2.5 MB">
-  <!ENTITY gnome-terminal-buildsize     "43 MB">
+  <!ENTITY gnome-terminal-buildsize     "48 MB">
   <!ENTITY gnome-terminal-time          "0.1 SBU (using parallelism=4)">
 ]>
@@ -87,5 +87,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="gnome-shell"/> and
+      <phrase revision="sysv"><xref linkend="gnome-shell"/> and</phrase>
       <xref linkend="nautilus"/>
     </para>
Index: gnome/applications/gnome-weather.xml
===================================================================
--- gnome/applications/gnome-weather.xml	(revision 4d59e9e6686220ce033a9db4b29f082be36b06b4)
+++ gnome/applications/gnome-weather.xml	(revision eb305e7ba1fd58392d510baf700549239a7a78ff)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-weather-download-http
-           "&gnome-download-http;/gnome-weather/&gnome-minor-36;/gnome-weather-&gnome-weather-version;.tar.xz">
+           "&gnome-download-http;/gnome-weather/&gnome-40;/gnome-weather-&gnome-weather-version;.tar.xz">
   <!ENTITY gnome-weather-download-ftp
-           "&gnome-download-ftp;/gnome-weather/&gnome-minor-36;/gnome-weather-&gnome-weather-version;.tar.xz">
-  <!ENTITY gnome-weather-md5sum        "a028a4662b235eb6de442598c7e07fbe">
-  <!ENTITY gnome-weather-size          "5.7 MB">
-  <!ENTITY gnome-weather-buildsize     "19 MB">
+           "&gnome-download-ftp;/gnome-weather/&gnome-40;/gnome-weather-&gnome-weather-version;.tar.xz">
+  <!ENTITY gnome-weather-md5sum        "a172aa420065fd58d376429d2e80f603">
+  <!ENTITY gnome-weather-size          "920 KB">
+  <!ENTITY gnome-weather-buildsize     "4.7 MB">
   <!ENTITY gnome-weather-time          "less than 0.1 SBU">
 ]>
@@ -79,6 +79,7 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gjs"/> and
-      <xref linkend="libgweather"/>
+      <xref linkend="gjs"/>,
+      <xref linkend="libgweather"/>, and
+      <xref linkend="libhandy1"/>
     </para>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 4d59e9e6686220ce033a9db4b29f082be36b06b4)
+++ introduction/welcome/changelog.xml	(revision eb305e7ba1fd58392d510baf700549239a7a78ff)
@@ -46,4 +46,56 @@
       <itemizedlist>
         <listitem>
+          <para>[renodr] - Update to baobab-40.0. Part of
+          <ulink url="&blfs-ticket-root;14801">#14801</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to eog-40.0. Part of
+          <ulink url="&blfs-ticket-root;14801">#14801</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to evince-40.1. Part of
+          <ulink url="&blfs-ticket-root;14801">#14801</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-calculator-40.0. Part of
+          <ulink url="&blfs-ticket-root;14801">#14801</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-disk-utility-40.0. Part of
+          <ulink url="&blfs-ticket-root;14801">#14801</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-maps-40.0. Part of
+          <ulink url="&blfs-ticket-root;14801">#14801</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-screenshot-40.0. Part of
+          <ulink url="&blfs-ticket-root;14801">#14801</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-system-monitor-40.0. Part of
+          <ulink url="&blfs-ticket-root;14801">#14801</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-terminal-3.40.0. Part of
+          <ulink url="&blfs-ticket-root;14801">#14801</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-weather-40.0. Part of
+          <ulink url="&blfs-ticket-root;14801">#14801</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gedit-40.0. Part of
+          <ulink url="&blfs-ticket-root;14801">#14801</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to epiphany-40.0. Part of
+          <ulink url="&blfs-ticket-root;14801">#14801</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Adapt Cheese to changes in vala-0.52. Fixes
+          <ulink url="&blfs-ticket-root;14882">#14882</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[thomas] - Update to xf86-input-libinput-1.0.0. Fixes
           <ulink url="&blfs-ticket-root;14872">#14872</ulink>.</para>
Index: packages.ent
===================================================================
--- packages.ent	(revision 4d59e9e6686220ce033a9db4b29f082be36b06b4)
+++ packages.ent	(revision eb305e7ba1fd58392d510baf700549239a7a78ff)
@@ -64,5 +64,5 @@
 <!ENTITY ed-version                   "1.17">
 <!ENTITY emacs-version                "27.2">
-<!ENTITY gedit-version                "3.38.1">
+<!ENTITY gedit-version                "40.0">
 <!ENTITY joe-version                  "4.6">
 <!ENTITY juffed-version               "0.10.r71.gc3c1a3f">
@@ -921,5 +921,5 @@
 <!-- Chapter 40 -->
 <!--<!ENTITY chromium-version             "64.0.3282.186">-->
-<!ENTITY epiphany-version             "3.38.3">
+<!ENTITY epiphany-version             "40.0">
 <!ENTITY falkon-major-version         "3.1">
 <!ENTITY falkon-minor-version         "0">
Index: postlfs/editors/gedit.xml
===================================================================
--- postlfs/editors/gedit.xml	(revision 4d59e9e6686220ce033a9db4b29f082be36b06b4)
+++ postlfs/editors/gedit.xml	(revision eb305e7ba1fd58392d510baf700549239a7a78ff)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY gedit-download-http "&gnome-download-http;/gedit/&gnome-minor-38;/gedit-&gedit-version;.tar.xz">
-  <!ENTITY gedit-download-ftp  "&gnome-download-ftp;/gedit/&gnome-minor-38;/gedit-&gedit-version;.tar.xz">
-  <!ENTITY gedit-md5sum        "19dcfd1631256ab85d9394225dddf167">
+  <!ENTITY gedit-download-http "&gnome-download-http;/gedit/&gnome-40;/gedit-&gedit-version;.tar.xz">
+  <!ENTITY gedit-download-ftp  "&gnome-download-ftp;/gedit/&gnome-40;/gedit-&gedit-version;.tar.xz">
+  <!ENTITY gedit-md5sum        "993332e9e6c5b6577d5fe891021bba04">
   <!ENTITY gedit-size          "6.5 MB">
-  <!ENTITY gedit-buildsize     "74 MB (with tests)">
+  <!ENTITY gedit-buildsize     "73 MB (with tests)">
   <!ENTITY gedit-time          "0.3 SBU (using parallelism=4; with tests)">
 ]>
@@ -163,8 +163,8 @@
         </seg>
         <seg>
-          libgedit-3.38.so
+          libgedit-40.0.so
         </seg>
         <seg>
-          /usr/include/gedit-3.38 and
+          /usr/include/gedit-40.0 and
           /usr/{lib,share,share/gtk-doc/html,share/help/*}/gedit
         </seg>
Index: xsoft/graphweb/epiphany.xml
===================================================================
--- xsoft/graphweb/epiphany.xml	(revision 4d59e9e6686220ce033a9db4b29f082be36b06b4)
+++ xsoft/graphweb/epiphany.xml	(revision eb305e7ba1fd58392d510baf700549239a7a78ff)
@@ -6,10 +6,10 @@
 
   <!ENTITY epiphany-download-http
-           "&gnome-download-http;/epiphany/&gnome-minor-38;/epiphany-&epiphany-version;.tar.xz">
+           "&gnome-download-http;/epiphany/&gnome-40;/epiphany-&epiphany-version;.tar.xz">
   <!ENTITY epiphany-download-ftp
-           "&gnome-download-ftp;/epiphany/&gnome-minor-38;/epiphany-&epiphany-version;.tar.xz">
-  <!ENTITY epiphany-md5sum        "e2e53c42f0ce20acf45ff651b403a321">
-  <!ENTITY epiphany-size          "3.7 MB">
-  <!ENTITY epiphany-buildsize     "93 MB"> 
+           "&gnome-download-ftp;/epiphany/&gnome-40;/epiphany-&epiphany-version;.tar.xz">
+  <!ENTITY epiphany-md5sum        "f5060e735e06e81c4150ecb871e0b243">
+  <!ENTITY epiphany-size          "5.1 MB">
+  <!ENTITY epiphany-buildsize     "107 MB"> 
   <!ENTITY epiphany-time          "0.3 SBU (Using parallelism=4, including tests)"> 
 ]>
