diff --git a/syslinux.changes b/syslinux.changes
index 9fdbd52..2fda345 100644
--- a/syslinux.changes
+++ b/syslinux.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri May 26 08:42:21 UTC 2023 - Marcus Meissner <meissner@suse.com>
+
+- Build the system installable binaries with RPM_OPT_FLAGS, to allow
+  utilization of stack-protector and FORTIFY_SOURCE. (bsc#1211640)
+
 -------------------------------------------------------------------
 Wed Jun  9 10:45:24 UTC 2021 - Wolfgang Frisch <wolfgang.frisch@suse.com>
 
diff --git a/syslinux.spec b/syslinux.spec
index 2d6f80d..99cbcf4 100644
--- a/syslinux.spec
+++ b/syslinux.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package syslinux
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -112,6 +112,14 @@ Authors:
 cp %{SOURCE2} .
 make spotless
 make
+# rebuild the on-system binaries with distribution optflags for stack protector etc.
+for dir in extlinux utils linux mtools
+do
+	cd $dir
+	make clean
+	make OPTFLAGS="%optflags"
+	cd ..
+done
 
 %install
 make install-all \