diff --git a/reproducible.patch b/reproducible.patch
new file mode 100644
index 0000000..2c78ce2
--- /dev/null
+++ b/reproducible.patch
@@ -0,0 +1,39 @@
+Index: trigger-rally-0.6.5/src/GNUmakefile
+===================================================================
+--- trigger-rally-0.6.5.orig/src/GNUmakefile
++++ trigger-rally-0.6.5/src/GNUmakefile
+@@ -17,7 +17,7 @@ TR_CFGFILE      := $(TR_BINDIR)/$(TR_CFG
+ TR_DATAFILES    := $(shell cd $(TR_DATADIR); find * -type f)
+ TR_DOCFILES     := $(shell cd $(TR_DOCDIR); find * -type f)
+ PROJDIRS        := PEngine PSim TinyXML2 Trigger
+-SRCFILES        := $(shell find $(PROJDIRS) -type f -name "*.cpp")
++SRCFILES        := $(sort $(shell find $(PROJDIRS) -type f -name "*.cpp"))
+ OBJFILES        := $(patsubst %.cpp, %.o, $(SRCFILES))
+ DEPFILES        := $(patsubst %.cpp, %.d, $(SRCFILES))
+ WARNINGS        ?= -Wall -Wextra -pedantic
+Index: trigger-rally-0.6.5/src/GNUmakefile.MSYS
+===================================================================
+--- trigger-rally-0.6.5.orig/src/GNUmakefile.MSYS
++++ trigger-rally-0.6.5/src/GNUmakefile.MSYS
+@@ -27,7 +27,7 @@ TR_DLLFILES     :=                  \
+     $(TR_BINDIR)/zlib1.dll
+ FMODAPIDIR      := /c/Program Files (x86)/FMOD SoundSystem/FMOD Studio API Windows/api/lowlevel
+ PROJDIRS        := PEngine PSim TinyXML2 Trigger
+-SRCFILES        := $(shell find $(PROJDIRS) -type f -name "*.cpp")
++SRCFILES        := $(sort $(shell find $(PROJDIRS) -type f -name "*.cpp"))
+ OBJFILES        := $(patsubst %.cpp, %.o, $(SRCFILES))
+ DEPFILES        := $(patsubst %.cpp, %.d, $(SRCFILES))
+ WARNINGS        ?= -Wall -Wextra -pedantic
+Index: trigger-rally-0.6.5/src/GNUmakefile.MSYS64
+===================================================================
+--- trigger-rally-0.6.5.orig/src/GNUmakefile.MSYS64
++++ trigger-rally-0.6.5/src/GNUmakefile.MSYS64
+@@ -26,7 +26,7 @@ TR_DLLFILES     :=                  \
+     $(TR_BINDIR)/zlib1.dll
+ FMODAPIDIR      := /c/Program Files (x86)/FMOD SoundSystem/FMOD Studio API Windows/api/lowlevel
+ PROJDIRS        := PEngine PSim TinyXML2 Trigger
+-SRCFILES        := $(shell find $(PROJDIRS) -type f -name "*.cpp")
++SRCFILES        := $(sort $(shell find $(PROJDIRS) -type f -name "*.cpp"))
+ OBJFILES        := $(patsubst %.cpp, %.o, $(SRCFILES))
+ DEPFILES        := $(patsubst %.cpp, %.d, $(SRCFILES))
+ WARNINGS        ?= -Wall -Wextra -pedantic
diff --git a/trigger-rally.changes b/trigger-rally.changes
index 80bedc3..123a64f 100644
--- a/trigger-rally.changes
+++ b/trigger-rally.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Jul 10 19:13:23 UTC 2018 - bwiedemann@suse.com
+
+- make compilation independent of build system CPU (boo#1100677)
+
+-------------------------------------------------------------------
+Mon May 22 09:27:59 UTC 2017 - bwiedemann@suse.com
+
+- Add reproducible.patch to sort input files to make build fully reproducible
+
 -------------------------------------------------------------------
 Fri Feb 17 10:47:11 UTC 2017 - rpm@fthiessen.de
 
diff --git a/trigger-rally.spec b/trigger-rally.spec
index 29372ad..164d88b 100644
--- a/trigger-rally.spec
+++ b/trigger-rally.spec
@@ -29,6 +29,8 @@ Source1:        %{name}.desktop
 # PATCH-FEATURE-UPSTREAM https://sourceforge.net/p/trigger-rally/patches/15/
 Source2:        %{name}.appdata.xml
 Source99:       %{name}.changes
+# PATCH-FIX-UPSTREAM https://sourceforge.net/p/trigger-rally/patches/18/
+Patch0:         reproducible.patch
 BuildRequires:  dos2unix
 BuildRequires:  fdupes
 %if %{?suse_version} > 1320
@@ -56,11 +58,13 @@ notes and co-driver icons.
 
 %prep
 %setup -q
+%patch0 -p1
 dos2unix doc/*.txt bin/*.defs
 modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{SOURCE99}")"
 DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\""
 TIME="\"$(date -d "${modified}" "+%%R")\""
 sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" src/PEngine/app.cpp src/Trigger/menu.cpp
+sed -i "s|-march=native||; s|-mtune=native||" src/GNUmakefile*
 
 %build
 %if %{?suse_version} <= 1320