diff --git a/memtest86+-gcc5.patch b/memtest86+-gcc5.patch
new file mode 100644
index 0000000..ee35f9f
--- /dev/null
+++ b/memtest86+-gcc5.patch
@@ -0,0 +1,11 @@
+--- memtest86+-5.01.orig/Makefile
++++ memtest86+-5.01/Makefile
+@@ -14,7 +14,7 @@ AS=as -32
+ CC=gcc
+ 
+ CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
+-	-ffreestanding -fPIC $(SMP_FL) -fno-stack-protector 
++	-ffreestanding -fPIC $(SMP_FL) -fno-stack-protector -fgnu89-inline
+ 	
+ OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
+       config.o cpuid.o linuxbios.o pci.o memsize.o spd.o error.o dmi.o controller.o \
diff --git a/memtest86+.changes b/memtest86+.changes
index 0b237cb..346cf70 100644
--- a/memtest86+.changes
+++ b/memtest86+.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar 23 23:46:06 UTC 2015 - crrodriguez@opensuse.org
+
+- memtest86+-gcc5.patch: Use -fgnu89-inline, fix build with 
+  GCC5, code relies on old inline semantics.
+
 -------------------------------------------------------------------
 Sun Feb 22 10:56:57 UTC 2015 - meissner@suse.com
 
diff --git a/memtest86+.spec b/memtest86+.spec
index b25c37b..e57a655 100644
--- a/memtest86+.spec
+++ b/memtest86+.spec
@@ -40,6 +40,7 @@ Patch0:         fix-destdir
 Patch1:         memtest86+-5.01-no-optimization.patch
 Patch2:         memtest86+-5.01-compile-fix.patch
 Patch3:         memtest86+-5.01-array-size-fix.patch
+Patch4:         memtest86+-gcc5.patch
 Summary:        Memory Testing Image for x86 Architecture
 License:        BSD-3-Clause
 Group:          System/Boot
@@ -54,7 +55,7 @@ booted, it can be used to test the computer's memory.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-
+%patch4 -p1
 %build
   make