diff --git a/0035-SYSAPPEND-Fix-space-stripping.patch b/0035-SYSAPPEND-Fix-space-stripping.patch
new file mode 100644
index 0000000..6ff4306
--- /dev/null
+++ b/0035-SYSAPPEND-Fix-space-stripping.patch
@@ -0,0 +1,58 @@
+From 3106dcd19061b4443c5beba4f0e09412e8d37fbe Mon Sep 17 00:00:00 2001
+From: Dany St-Amant <dany.ephemeral.2014@icloud.com>
+Date: Fri, 28 Nov 2014 13:48:32 -0500
+Subject: [PATCH 35/74] SYSAPPEND: Fix space stripping
+
+The description of SYSAPPEND for the DMI information states that the spaces
+are replaced by underscores, but this replacement does not occur in 6.03.
+
+Signed-off-by: Dany St-Amant <dany.ephemeral.2014@icloud.com>
+Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
+---
+ com32/elflink/ldlinux/readconfig.c | 2 +-
+ com32/menu/readconfig.c            | 2 +-
+ core/sysappend.c                   | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/com32/elflink/ldlinux/readconfig.c b/com32/elflink/ldlinux/readconfig.c
+index 347f826..24f1cc9 100644
+--- a/com32/elflink/ldlinux/readconfig.c
++++ b/com32/elflink/ldlinux/readconfig.c
+@@ -330,7 +330,7 @@ static char *copy_sysappend_string(char *dst, const char *src)
+     char c;
+ 
+     while ((c = *src++)) {
+-	if (c <= ' ' && c == '\x7f') {
++	if (c <= ' ' || c == '\x7f') {
+ 	    if (!was_space)
+ 		*dst++ = '_';
+ 	    was_space = true;
+diff --git a/com32/menu/readconfig.c b/com32/menu/readconfig.c
+index b7814be..257b042 100644
+--- a/com32/menu/readconfig.c
++++ b/com32/menu/readconfig.c
+@@ -299,7 +299,7 @@ static char *copy_sysappend_string(char *dst, const char *src)
+     char c;
+ 
+     while ((c = *src++)) {
+-	if (c <= ' ' && c == '\x7f') {
++	if (c <= ' ' || c == '\x7f') {
+ 	    if (!was_space)
+ 		*dst++ = '_';
+ 	    was_space = true;
+diff --git a/core/sysappend.c b/core/sysappend.c
+index 5c3f650..758703e 100644
+--- a/core/sysappend.c
++++ b/core/sysappend.c
+@@ -35,7 +35,7 @@ static char *copy_and_mangle(char *dst, const char *src)
+     char c;
+ 
+     while ((c = *src++)) {
+-	if (c <= ' ' && c == '\x7f') {
++	if (c <= ' ' || c == '\x7f') {
+ 	    if (!was_space)
+ 		*dst++ = '_';
+ 	    was_space = true;
+-- 
+2.4.5
+
diff --git a/syslinux.spec b/syslinux.spec
index 6211bae..41941df 100644
--- a/syslinux.spec
+++ b/syslinux.spec
@@ -2,12 +2,14 @@ Summary: Simple kernel loader which boots from a FAT filesystem
 Name: syslinux
 Version: 6.03
 %define tarball_version 6.03
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://syslinux.zytor.com/wiki/index.php/The_Syslinux_Project
 Source0: http://www.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{tarball_version}.tar.xz
 Patch0001: 0001-Add-install-all-target-to-top-side-of-HAVE_FIRMWARE.patch
+# Backport from upstream git master to fix RHBZ #1234653
+Patch0002: 0035-SYSAPPEND-Fix-space-stripping.patch
 
 # this is to keep rpmbuild from thinking the .c32 / .com / .0 / memdisk files
 # in noarch packages are a reason to stop the build.
@@ -257,6 +259,9 @@ elif [ -f /boot/extlinux.conf ]; then \
 fi
 
 %changelog
+* Fri Jul 03 2015 Adam Williamson <awilliam@redhat.com> - 6.03-5
+- backport a commit from git master which appears to fix RHBZ #1234653
+
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.03-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild