diff --git a/xemacs-21.5.34-fix2038.patch b/xemacs-21.5.34-fix2038.patch
new file mode 100644
index 0000000..d2f7f79
--- /dev/null
+++ b/xemacs-21.5.34-fix2038.patch
@@ -0,0 +1,20 @@
+Author: Bernhard M. Wiedemann <bwiedemann suse de>
+Date: 2023-01-14
+Subject: Fix build in 2038
+
+The UNIX Epoch needs more than 31 bits after 2038-01-19
+so we extend the variable to 64 bits
+
+Index: xemacs-21.5.34/src/buffer.h
+===================================================================
+--- xemacs-21.5.34.orig/src/buffer.h
++++ xemacs-21.5.34/src/buffer.h
+@@ -246,7 +246,7 @@ struct buffer
+      -1 means visited file was nonexistent.
+      0  means visited file modtime unknown; in no case complain
+      about any mismatch on next save attempt.  */
+-  int modtime;
++  long long modtime;
+ 
+   /* the value of text->modiff at the last auto-save.  */
+   long auto_save_modified;
diff --git a/xemacs.changes b/xemacs.changes
index 460a732..d4a313c 100644
--- a/xemacs.changes
+++ b/xemacs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Jan 14 05:04:47 UTC 2023 - Bernhard Wiedemann <bwiedemann@suse.com>
+
+- Add xemacs-21.5.34-fix2038.patch to fix buffers after year 2038
+
 -------------------------------------------------------------------
 Mon Aug  8 15:32:40 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/xemacs.spec b/xemacs.spec
index 723f4ff..aa54ef6 100644
--- a/xemacs.spec
+++ b/xemacs.spec
@@ -113,6 +113,7 @@ Patch61:        xemacs-21.5.34-boo1115177.patch
 Patch62:        xemacs-libX11-boo1175028.patch
 # PATCH-FIX-SUSE sys_siglist is deprecated
 Patch63:        xemacs-21.5.34-strsignal.patch
+Patch64:        xemacs-21.5.34-fix2038.patch
 Requires(pre):  permissions
 Requires:       ctags
 Requires:       efont-unicode
@@ -227,6 +228,7 @@ exit 1
 %endif
 %endif
 %endif
+%patch64 -p1
 
 %build
   cflags ()