diff --git a/SOURCES/proc-rv.patch b/SOURCES/proc-rv.patch
new file mode 100644
index 0000000..3e2f342
--- /dev/null
+++ b/SOURCES/proc-rv.patch
@@ -0,0 +1,22 @@
+diff --git a/io.c b/io.c
+index 1d440c1..07d8368 100644
+--- a/io.c
++++ b/io.c
+@@ -2599,7 +2599,7 @@ wait_any(int interesting)	/* pid of interest, if any */
+ 		for (redp = red_head; redp != NULL; redp = redp->next)
+ 			if (interesting == redp->pid) {
+ 				redp->pid = -1;
+-				redp->status = status;
++				redp->status = sanitize_exit_status(status);
+ 				break;
+ 			}
+ 	}
+@@ -2629,7 +2629,7 @@ wait_any(int interesting)	/* pid of interest, if any */
+ 			for (redp = red_head; redp != NULL; redp = redp->next)
+ 				if (pid == redp->pid) {
+ 					redp->pid = -1;
+-					redp->status = status;
++					redp->status = sanitize_exit_status(status);
+ 					break;
+ 				}
+ 		}
diff --git a/SPECS/gawk.spec b/SPECS/gawk.spec
index 837abda..cbeb1fa 100644
--- a/SPECS/gawk.spec
+++ b/SPECS/gawk.spec
@@ -44,7 +44,7 @@
 Name:             gawk
 Summary:          The GNU version of the AWK text processing utility
 Version:          4.2.1
-Release:          2%{?dist}
+Release:          4%{?dist}
 
 License:          GPLv3+ and GPLv2+ and LGPLv2+ and BSD
 
@@ -105,8 +105,7 @@ BuildRequires:    bison
 # ----------------    last rebase that are necessary for any reason:
 #Patch000: example000.patch
 Patch000: assign-int.patch
-
-
+Patch001: proc-rv.patch
 
 # Downstream patches -- these should be always included when doing rebase:
 # ------------------
@@ -258,6 +257,14 @@ install -m 0644 -p doc/gawkinet.{pdf,ps} %{buildroot}%{_docdir}/%{name}
 # =============================================================================
 
 %changelog
+* Fri Feb 11 2022 Jakub Martisko <jamartis@redhat.com> - 4.2.1-4
+- Rebuild with some gating tests disabled
+Resolves: rhbz#2053515
+
+* Thu Feb 10 2022 Jakub Martisko <jamartis@redhat.com> - 4.2.1-3
+Fix the issue with an incorect handling of return code of some processes
+Resolves: rhbz#2018077
+
 * Tue Nov 24 2020 Jakub Martisko <jamartis@redhat.com> - 4.2.1-2
 - Fix an issue with an int() value not being assigned to a variable
 Resolves: #1893370