diff --git a/_lastrevision b/_lastrevision
index 40ec03d..578f3b8 100644
--- a/_lastrevision
+++ b/_lastrevision
@@ -1 +1 @@
-27bd69d21f942f677c6f257ae1b69a6e6ac6ec39
\ No newline at end of file
+3becea2e5b00beff724c22a8ae320d4567031c7b
\ No newline at end of file
diff --git a/salt.changes b/salt.changes
index f9d1ec6..1675027 100644
--- a/salt.changes
+++ b/salt.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Sep 20 12:17:44 UTC 2023 - Pablo Suárez Hernández <pablo.suarezhernandez@suse.com>
+
+- Fix inconsistency in reported version by egg-info metadata (bsc#1215489)
+
+- Added:
+  * write-salt-version-before-building-when-using-with-s.patch
+
 -------------------------------------------------------------------
 Fri Sep  1 07:33:18 UTC 2023 - Victor Zhestkov <vzhestkov@suse.com>
 
diff --git a/salt.spec b/salt.spec
index 3530d82..c52d911 100644
--- a/salt.spec
+++ b/salt.spec
@@ -302,6 +302,8 @@ Patch77:        make-sure-configured-user-is-properly-set-by-salt-bs.patch
 Patch78:        fixed-gitfs-cachedir_basename-to-avoid-hash-collisio.patch
 # PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/600
 Patch79:        revert-usage-of-long-running-req-channel-bsc-1213960.patch
+# PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/65238
+Patch80:        write-salt-version-before-building-when-using-with-s.patch
 
 ### IMPORTANT: The line below is used as a snippet marker. Do not touch it.
 ### SALT PATCHES LIST END
diff --git a/write-salt-version-before-building-when-using-with-s.patch b/write-salt-version-before-building-when-using-with-s.patch
new file mode 100644
index 0000000..75bcec5
--- /dev/null
+++ b/write-salt-version-before-building-when-using-with-s.patch
@@ -0,0 +1,30 @@
+From cc161359ef7432960ef2f0b8f816986fa6798403 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
+ <psuarezhernandez@suse.com>
+Date: Wed, 20 Sep 2023 13:07:29 +0100
+Subject: [PATCH] Write salt version before building when using
+ --with-salt-version (bsc#1215489) (#604)
+
+---
+ setup.py | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/setup.py b/setup.py
+index 8ca8a66d45..cf7e54f930 100755
+--- a/setup.py
++++ b/setup.py
+@@ -591,6 +591,10 @@ HOME_DIR = {home_dir!r}
+ 
+ class Build(build):
+     def run(self):
++        if getattr(self.distribution, "with_salt_version", False):
++            self.distribution.salt_version_hardcoded_path = SALT_VERSION_HARDCODED
++            self.run_command("write_salt_version")
++
+         # Run build.run function
+         build.run(self)
+         salt_build_ver_file = os.path.join(self.build_lib, "salt", "_version.txt")
+-- 
+2.41.0
+
+