diff --git a/varnish-6.3.2_fix_s390x.patch b/varnish-6.3.2_fix_s390x.patch
index 4a75148..50656c7 100644
--- a/varnish-6.3.2_fix_s390x.patch
+++ b/varnish-6.3.2_fix_s390x.patch
@@ -1,11 +1,19 @@
---- bin/varnishtest/vtc_varnish.c.orig	2020-02-10 23:29:22.765650634 +0100
-+++ bin/varnishtest/vtc_varnish.c	2020-02-10 23:30:04.179140158 +0100
-@@ -117,7 +117,7 @@
- 			    cmd, errno, strerror(errno));
- 	}
+commit b0af060fb688b8fc2ff3817ea99430432668b291
+Author: Ingvar Hagelund <ingvar@redpill-linpro.com>
+Date:   Tue Feb 11 12:56:54 2020 +0100
+
+    simple fix for fedora/gcc-10.0.1: -Werror=format-overflow, by some reason hit on s390x
+
+diff --git a/bin/varnishtest/vtc_varnish.c b/bin/varnishtest/vtc_varnish.c
+index 1ec748cb6..09e49d258 100644
+--- a/bin/varnishtest/vtc_varnish.c
++++ b/bin/varnishtest/vtc_varnish.c
+@@ -121,7 +121,7 @@ varnish_ask_cli(const struct varnish *v, const char *cmd, char **repl)
  	i = VCLI_ReadResult(v->cli_fd, &retval, &r, vtc_maxdur);
--	if (i != 0 && !vtc_stop)
-+	if (i != 0 && !vtc_stop && cmd != NULL)
+ 	if (i != 0 && !vtc_stop)
  		vtc_fatal(v->vl, "CLI failed (%s) = %d %u %s",
- 		    cmd, i, retval, r);
+-		    cmd, i, retval, r);
++		    cmd != NULL ? cmd : "NULL", i, retval, r);
  	vtc_log(v->vl, 3, "CLI RX  %u", retval);
+ 	vtc_dump(v->vl, 4, "CLI RX", r, -1);
+ 	if (repl != NULL)
diff --git a/varnish.spec b/varnish.spec
index bab6961..e05c0f6 100644
--- a/varnish.spec
+++ b/varnish.spec
@@ -24,7 +24,7 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
 Version: 6.3.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 URL: https://www.varnish-cache.org/
 Source0: http://varnish-cache.org/_downloads/%{name}-%{version}%{?vd_rc}.tgz
@@ -62,7 +62,7 @@ Patch16: varnish-6.3.0_el6_fix_warning_from_old_gcc.patch
 # Patch  017: Fix stack size on ppc64 in test c_00057, upstream commit 88948d9
 #Patch17: varnish-6.2.0_fix_ppc64_for_test_c00057.patch
 
-# Patch 018: gcc-10.0.1/s390x compilation fix
+# Patch 018: gcc-10.0.1/s390x compilation fix, upstream commit b0af060
 Patch18: varnish-6.3.2_fix_s390x.patch
 
 %if 0%{?fedora} > 29
@@ -191,7 +191,7 @@ sed -i '8 i\RPM_BUILD_ROOT=%{buildroot}' find-provides
 %patch16 -p1
 %endif
 
-%patch18 -p0
+%patch18 -p1
 
 %build
 %if 0%{?rhel} == 6
@@ -426,6 +426,9 @@ fi
 
 
 %changelog
+* Wed Feb 12 2020 Ingvar Hagelund <ingvar@redpill-linpro.com> - 6.3.2-3
+- Got corrected compilation fix patch from upstream
+
 * Tue Feb 11 2020 Ingvar Hagelund <ingvar@redpill-linpro.com> - 6.3.2-2
 - Added simple compilation fix for gcc-10.0.1/s390x