diff --git a/remove-note-gnu-section.patch b/remove-note-gnu-section.patch
new file mode 100644
index 0000000..9b7dcd4
--- /dev/null
+++ b/remove-note-gnu-section.patch
@@ -0,0 +1,13 @@
+diff --git a/mbr/Makefile b/mbr/Makefile
+index be2bded7..59e06915 100644
+--- a/mbr/Makefile
++++ b/mbr/Makefile
+@@ -36,7 +36,7 @@
+ 	$(LD) $(LDFLAGS) -T mbr.ld -e _start -o $@ $<
+ 
+ %.bin: %.elf checksize.pl
+-	$(OBJCOPY) -O binary $< $@
++	$(OBJCOPY) -O binary --remove-section .note.gnu.property $< $@
+ 	$(PERL) checksize.pl $@
+ 	$(CHMOD) -x $@
+ 
diff --git a/syslinux.changes b/syslinux.changes
index 8852228..a05221f 100644
--- a/syslinux.changes
+++ b/syslinux.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Nov 28 09:03:05 UTC 2018 - Martin Liška <mliska@suse.cz>
+
+- Add remove-note-gnu-section.patch: strip a newly added section
+  in order to fulfil ELF size limits expected.
+
 -------------------------------------------------------------------
 Mon Aug  6 07:35:52 UTC 2018 - schwab@suse.de
 
diff --git a/syslinux.spec b/syslinux.spec
index b48bcf7..86d8402 100644
--- a/syslinux.spec
+++ b/syslinux.spec
@@ -12,7 +12,7 @@
 # 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/
 #
 
 
@@ -60,6 +60,7 @@ Patch18:        %{name}-%{version}-align.diff
 Patch19:        syslinux-4.04-reproducible.patch
 Patch20:        %{name}-%{version}-python3.diff
 Patch21:        sysmacros.patch
+Patch22:        remove-note-gnu-section.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -97,6 +98,7 @@ Authors:
 %patch19 -p1
 %patch20 -p0
 %patch21 -p1
+%patch22 -p1
 
 %build
 cp %{SOURCE2} .