diff --git a/SOURCES/strace-b89a69dec27cf638df0e17db80ed937c3e1abf77.patch b/SOURCES/strace-b89a69dec27cf638df0e17db80ed937c3e1abf77.patch
new file mode 100644
index 0000000..34e3ad0
--- /dev/null
+++ b/SOURCES/strace-b89a69dec27cf638df0e17db80ed937c3e1abf77.patch
@@ -0,0 +1,71 @@
+diff -Naurp a/xlat/v4l2_control_id_bases.h b/xlat/v4l2_control_id_bases.h
+--- a/xlat/v4l2_control_id_bases.h	2018-08-14 00:44:25.000000000 +0000
++++ b/xlat/v4l2_control_id_bases.h	2019-05-23 12:21:15.396137688 +0000
+@@ -31,12 +31,16 @@ DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
+ #else
+ # define V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_BASE + 0x1050)
+ #endif
++#ifndef STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE
++# define STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE
++# undef V4L2_CID_USER_IMX_BASE
++#endif
+ #if defined(V4L2_CID_USER_IMX_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_IMX_BASE) && HAVE_DECL_V4L2_CID_USER_IMX_BASE)
+ DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
+-static_assert((V4L2_CID_USER_IMX_BASE) == ((V4L2_CID_BASE + 0x1090)), "V4L2_CID_USER_IMX_BASE != (V4L2_CID_BASE + 0x1090)");
++static_assert((V4L2_CID_USER_IMX_BASE) == ((V4L2_CID_BASE + 0x10b0)), "V4L2_CID_USER_IMX_BASE != (V4L2_CID_BASE + 0x10b0)");
+ DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
+ #else
+-# define V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE + 0x1090)
++# define V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE + 0x10b0)
+ #endif
+ #if defined(V4L2_CID_MPEG_BASE) || (defined(HAVE_DECL_V4L2_CID_MPEG_BASE) && HAVE_DECL_V4L2_CID_MPEG_BASE)
+ DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
+@@ -146,6 +150,21 @@ const struct xlat v4l2_control_id_bases[
+  XLAT(V4L2_CID_USER_MEYE_BASE),
+  XLAT(V4L2_CID_USER_BTTV_BASE),
+  XLAT(V4L2_CID_USER_TI_VPE_BASE),
++#ifndef STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE
++# define STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE
++/*
++* Linux kernel commit v4.18-rc2-106-g421860b9d47053badce4b247576fa48df9ab4c48
++* has changed the value of V4L2_CID_USER_IMX_BASE constant introduced
++* by commit v4.13-rc1~141^2~121 because the old value was already used
++* by V4L2_CID_USER_MAX217X_BASE.
++* This is of course an ABI breakage that affects Linux kernels starting
++* with 4.13 and up to 4.18, as well as their LTS derivatives.
++* Since the imx driver didn't provide any public control ID definitions,
++* it looks like the best way to handle this situation is to pretend that
++* the old value of V4L2_CID_USER_IMX_BASE didn't exist.
++*/
++# undef V4L2_CID_USER_IMX_BASE
++#endif
+  XLAT(V4L2_CID_USER_IMX_BASE),
+  XLAT(V4L2_CID_MPEG_BASE),
+  XLAT(V4L2_CID_MPEG_CX2341X_BASE),
+diff -Naurp a/xlat/v4l2_control_id_bases.in b/xlat/v4l2_control_id_bases.in
+--- a/xlat/v4l2_control_id_bases.in	2018-05-06 15:34:41.000000000 +0000
++++ b/xlat/v4l2_control_id_bases.in	2019-05-23 12:21:01.146061843 +0000
+@@ -2,7 +2,22 @@ V4L2_CID_BASE				(V4L2_CTRL_CLASS_USER |
+ V4L2_CID_USER_MEYE_BASE			(V4L2_CID_BASE + 0x1000)
+ V4L2_CID_USER_BTTV_BASE			(V4L2_CID_BASE + 0x1010)
+ V4L2_CID_USER_TI_VPE_BASE		(V4L2_CID_BASE + 0x1050)
+-V4L2_CID_USER_IMX_BASE			(V4L2_CID_BASE + 0x1090)
++#ifndef STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE
++# define STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE
++/*
++ * Linux kernel commit v4.18-rc2-106-g421860b9d47053badce4b247576fa48df9ab4c48
++ * has changed the value of V4L2_CID_USER_IMX_BASE constant introduced
++ * by commit v4.13-rc1~141^2~121 because the old value was already used
++ * by V4L2_CID_USER_MAX217X_BASE.
++ * This is of course an ABI breakage that affects Linux kernels starting
++ * with 4.13 and up to 4.18, as well as their LTS derivatives.
++ * Since the imx driver didn't provide any public control ID definitions,
++ * it looks like the best way to handle this situation is to pretend that
++ * the old value of V4L2_CID_USER_IMX_BASE didn't exist.
++ */
++# undef V4L2_CID_USER_IMX_BASE
++#endif
++V4L2_CID_USER_IMX_BASE			(V4L2_CID_BASE + 0x10b0)
+ V4L2_CID_MPEG_BASE			(V4L2_CTRL_CLASS_MPEG | 0x900)
+ V4L2_CID_MPEG_CX2341X_BASE		(V4L2_CTRL_CLASS_MPEG | 0x1000)
+ V4L2_CID_MPEG_MFC51_BASE		(V4L2_CTRL_CLASS_MPEG | 0x1100)
diff --git a/SPECS/strace.spec b/SPECS/strace.spec
index 1a80a1f..16df542 100644
--- a/SPECS/strace.spec
+++ b/SPECS/strace.spec
@@ -151,6 +151,7 @@ Patch200: 0200-strace-provide-O_TMPFILE-fallback-definition.patch
 ## RHEL-only: aarch64 brew builders are extremely slow on qual_fault.test
 Patch201: 0201-limit-qual_fault-scope-on-aarch64.patch
 
+Patch9999: strace-b89a69dec27cf638df0e17db80ed937c3e1abf77.patch
 
 # In the past we had a separate strace64 package, these days the
 # stndard 64 bit build provides that functionality.  For tracing
@@ -238,6 +239,10 @@ binary supports tracing of 32-bit processes as well.
 %patch200 -p1
 %patch201 -p1
 
+%ifarch %{arm}
+%patch9999 -p1
+%endif
+
 echo -n %version-%release > .tarball-version
 echo -n 2019 > .year
 echo -n 2019-08-01 > .strace.1.in.date
@@ -317,6 +322,7 @@ if [ "x${uname_r#2.6.32}" != "x${uname_r}" ] && \
    [ "x${uname_r%s390x}" != "x${uname_r}" ]
 then
 	echo "Skipping tests, kernel (${uname_r}) is too broken"
+%ifnarch %{arm}
 else
 	# We have to limit concurrent execution of tests as some time-sensitive
 	# tests start to fail if the reported time is way too off
@@ -326,6 +332,7 @@ else
 	find tests* -type f -name '*.log' -print0 |
 		xargs -r0 grep -H '^KERNEL BUG:' -- ||:
 	echo 'END OF TEST SUITE INFORMATION'
+%endif
 fi
 
 %clean