diff --git a/xemacs-21.5.34-boo1115177.patch b/xemacs-21.5.34-boo1115177.patch
new file mode 100644
index 0000000..13fa4ed
--- /dev/null
+++ b/xemacs-21.5.34-boo1115177.patch
@@ -0,0 +1,25 @@
+---
+ src/Makefile.in.in |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- src/Makefile.in.in
++++ src/Makefile.in.in	2018-11-08 15:47:11.423581279 +0000
+@@ -537,6 +537,9 @@ link_deps = $(start_files) $(objs) $(oth
+ $(LIB_SRC)/make-dump-id:
+ 	cd $(LIB_SRC) && $(MAKE) $(RECURSIVE_MAKE_ARGS) make-dump-id
+ 
++$(LIB_SRC)/insert-data-in-exec:
++	cd $(LIB_SRC) && $(MAKE) $(RECURSIVE_MAKE_ARGS) insert-data-in-exec
++
+ dump-id.c: $(LIB_SRC)/make-dump-id $(link_deps)
+ 	$(LIB_SRC)/make-dump-id
+ 
+@@ -586,7 +589,7 @@ $(LIB_SRC)/DOC: $(LIB_SRC)/make-docfile
+ 
+ ## (5) Dump
+ 
+-$(DUMP_TARGET): $(RAW_EXE) $(BLDSRC)/NEEDTODUMP $(LIB_SRC)/DOC
++$(DUMP_TARGET): $(RAW_EXE) $(BLDSRC)/NEEDTODUMP $(LIB_SRC)/DOC $(LIB_SRC)/insert-data-in-exec
+ #ifdef HEAP_IN_DATA
+ 	@$(RM) $@ && touch SATISFIED
+ 	$(dump_temacs)
diff --git a/xemacs.changes b/xemacs.changes
index 55a4b82..b2746ba 100644
--- a/xemacs.changes
+++ b/xemacs.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov  8 15:56:38 UTC 2018 - Dr. Werner Fink <werner@suse.de>
+
+- Add patch xemacs-21.5.34-boo1115177.patch to avoid possible
+  race within build dependencies (boo#1115177)
+
 -------------------------------------------------------------------
 Thu Dec 28 15:46:18 UTC 2017 - crrodriguez@opensuse.org
 
diff --git a/xemacs.spec b/xemacs.spec
index cc413a1..e65f59b 100644
--- a/xemacs.spec
+++ b/xemacs.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xemacs
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,13 +12,14 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:           xemacs
 # this is tricky to fix for PIE support. revisit to remove occasionaly after 21.5.34 version
 #!BuildIgnore:	gcc-PIE
+#!BuildIgnore:  diffstat
 BuildRequires:  alsa-lib-devel
 BuildRequires:  autoconf
 BuildRequires:  canna-devel
@@ -54,7 +55,7 @@ BuildRequires:  gpm
 Version:        21.5.34
 Release:        0
 Summary:        XEmacs
-License:        GPL-3.0+
+License:        GPL-3.0-or-later
 Group:          Productivity/Editors/Emacs
 %define	appdefdir  /usr/share/X11
 %define xbindir    /usr/bin
@@ -105,6 +106,8 @@ Patch58:        xemacs-21.5.34-custom-fonts.patch
 Patch59:        xemacs-21.5.34-alsaplay.patch
 # PATCH-FIX-SUSE avoid redefinition of sbrk
 Patch60:        xemacs-21.5.34-sbrk.patch
+# PATCH-FIX-SUSE fix make build race
+Patch61:        xemacs-21.5.34-boo1115177.patch
 Requires(pre):  permissions
 Requires:       ctags
 Requires:       efont-unicode
@@ -198,6 +201,7 @@ echo Use xfs, that is XFontSet support for internationalized menubar.
 %patch58 -p0
 %patch59 -p1
 %patch60 -p0
+%patch61 -p0
 %patch0 -p1
 find lisp/ etc/ -name '*.elc' | xargs -r rm -f
 find . -name CVS -type d | xargs rm -rf