diff --git a/roc-toolkit-0.1.5-no-explicit-cpp98.patch b/roc-toolkit-0.1.5-no-explicit-cpp98.patch
new file mode 100644
index 0000000..e702063
--- /dev/null
+++ b/roc-toolkit-0.1.5-no-explicit-cpp98.patch
@@ -0,0 +1,16 @@
+diff --git a/SConstruct b/SConstruct
+index 7e02af7..224f1f8 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -1069,11 +1069,6 @@ if platform in ['linux']:
+     env.AppendUnique(LIBS=['rt', 'dl', 'm'])
+ 
+ if compiler in ['gcc', 'clang']:
+-    if not platform in ['android']:
+-        env.Append(CXXFLAGS=[
+-            '-std=c++98',
+-        ])
+-
+     env.Append(CXXFLAGS=[
+         '-fno-exceptions',
+     ])
diff --git a/roc-toolkit.spec b/roc-toolkit.spec
index af69990..8a9522d 100644
--- a/roc-toolkit.spec
+++ b/roc-toolkit.spec
@@ -31,6 +31,8 @@ BuildRequires:	cpputest-devel
 BuildRequires:	sphinx
 BuildRequires:	python3-sphinx
 BuildRequires:	python3-breathe
+# https://github.com/roc-streaming/roc-toolkit/issues/481
+Patch0:		roc-toolkit-0.1.5-no-explicit-cpp98.patch
 
 %description
 Roc is a toolkit for real-time audio streaming over the network.
@@ -69,7 +71,10 @@ scons install --with-openfec-includes=%{_includedir}/openfec --prefix=%{buildroo
   --libdir=%{buildroot}%{_libdir}
 
 %check
+# https://github.com/roc-streaming/roc-toolkit/issues/480
+%ifnarch i686
 scons test --with-openfec-includes=%{_includedir}/openfec
+%endif
 
 %files
 %license LICENSE