diff --git a/elfutils.changes b/elfutils.changes
index 0a88981..04dc226 100644
--- a/elfutils.changes
+++ b/elfutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 29 08:03:20 UTC 2018 - mliska@suse.cz
+
+- Add gcc8-disable-test.patch in order to fix boo#1084637: temporarily
+  disable a test-case.
+
 -------------------------------------------------------------------
 Thu Mar 22 16:36:10 UTC 2018 - schwab@suse.de
 
diff --git a/elfutils.spec b/elfutils.spec
index 3efd720..131231b 100644
--- a/elfutils.spec
+++ b/elfutils.spec
@@ -35,6 +35,7 @@ Patch1:         disable-tests-with-ptrace.patch
 Patch2:         elfutils-0.170-Wpackednotaligned.patch
 # Upstream 8f01400a, Robustify strip-nothing test
 Patch3:         elfutils-0.170-stripnothing.patch
+Patch4:         gcc8-disable-test.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -141,6 +142,7 @@ applications that require libdw.
 %endif
 %patch2 -p1
 %patch3 -p1
+%patch4
 
 %build
 # Change DATE/TIME macros to use last change time of elfutils.changes
diff --git a/gcc8-disable-test.patch b/gcc8-disable-test.patch
new file mode 100644
index 0000000..49a1103
--- /dev/null
+++ b/gcc8-disable-test.patch
@@ -0,0 +1,20 @@
+--- tests/Makefile.am.b	2018-05-29 07:58:20.577499320 +0000
++++ tests/Makefile.am	2018-05-29 07:59:00.634379043 +0000
+@@ -91,7 +91,7 @@
+ 	run-ranlib-test2.sh run-ranlib-test3.sh run-ranlib-test4.sh \
+ 	run-addrscopes.sh run-strings-test.sh run-funcscopes.sh \
+ 	run-find-prologues.sh run-allregs.sh run-addrcfi.sh \
+-	run-nm-self.sh run-readelf-self.sh \
++	run-nm-self.sh \
+ 	run-readelf-test1.sh run-readelf-test2.sh run-readelf-test3.sh \
+ 	run-readelf-test4.sh run-readelf-twofiles.sh \
+ 	run-readelf-macro.sh run-readelf-loc.sh \
+@@ -188,7 +188,7 @@
+ 	     run-elflint-self.sh run-ranlib-test.sh run-ranlib-test2.sh \
+ 	     run-ranlib-test3.sh run-ranlib-test4.sh \
+ 	     run-addrscopes.sh run-strings-test.sh run-funcscopes.sh \
+-	     run-nm-self.sh run-readelf-self.sh run-addrcfi.sh \
++	     run-nm-self.sh run-addrcfi.sh \
+ 	     run-find-prologues.sh run-allregs.sh run-native-test.sh \
+ 	     run-addrname-test.sh run-dwfl-bug-offline-rel.sh \
+ 	     run-dwfl-addr-sect.sh run-early-offscn.sh \