diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 2132547c83..db82a60be7 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -38,6 +38,16 @@
       </itemizedlist>
     </listitem>
     -->
+   <listitem>
+      <para>March 13th, 2023</para>
+      <itemizedlist>
+        <listitem>
+          <para>[timtas] - Update to samba-4.18.0. Fixes
+          <ulink url="&blfs-ticket-root;17767">#17767</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>March 12th, 2023</para>
       <itemizedlist>
diff --git a/networking/netprogs/samba.xml b/networking/netprogs/samba.xml
index 3ee485cd9e..acd585a80d 100644
--- a/networking/netprogs/samba.xml
+++ b/networking/netprogs/samba.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY samba-download-http "https://download.samba.org/pub/samba/stable/samba-&samba-version;.tar.gz">
   <!ENTITY samba-download-ftp  " ">
-  <!ENTITY samba-md5sum        "8e1d89cad4de151a6de83ff1eac359a1">
-  <!ENTITY samba-size          "29 MB">
-  <!ENTITY samba-buildsize     "715 MB (add 30 MB for quicktest)">
+  <!ENTITY samba-md5sum        "a36cc7b01305bb8cba9846ac2fbd56d5">
+  <!ENTITY samba-size          "40 MB">
+  <!ENTITY samba-buildsize     "586 MB (add 30 MB for quicktest)">
   <!ENTITY samba-time          "2.2 SBU (using parallelism=4; add 0.3 SBU for quicktest)">
 ]>
 
diff --git a/packages.ent b/packages.ent
index 854a7ff0a9..8ef7fcb57a 100644
--- a/packages.ent
+++ b/packages.ent
@@ -660,7 +660,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY ntp-version                  "4.2.8p15">
 <!ENTITY rpcbind-version              "1.2.6">
 <!ENTITY rsync-version                "3.2.7">
-<!ENTITY samba-version                "4.17.5">
+<!ENTITY samba-version                "4.18.0">
 <!ENTITY wget-version                 "1.21.3">
 <!ENTITY wireless-tools-version       "29">
 <!ENTITY wpa_supplicant-version       "2.10">