diff --git a/SOURCES/bz1914313-fence_zvmip-fix-disable-timeout.patch b/SOURCES/bz1914313-fence_zvmip-fix-disable-timeout.patch
new file mode 100644
index 0000000..ee80db1
--- /dev/null
+++ b/SOURCES/bz1914313-fence_zvmip-fix-disable-timeout.patch
@@ -0,0 +1,23 @@
+From 900afe24edf0f400e9f1ed9b4df66e62cfee380e Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Fri, 8 Jan 2021 16:16:59 +0100
+Subject: [PATCH] fence_zvmip: fix shell-timeout when using new disable-timeout
+ parameter
+
+---
+ agents/zvm/fence_zvmip.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/agents/zvm/fence_zvmip.py b/agents/zvm/fence_zvmip.py
+index 5b272bb9..001106a4 100644
+--- a/agents/zvm/fence_zvmip.py
++++ b/agents/zvm/fence_zvmip.py
+@@ -28,7 +28,7 @@ def open_socket(options):
+ 
+ 	conn = socket.socket()
+ 	conn.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+-	conn.settimeout(float(options["--shell-timeout"]))
++	conn.settimeout(float(options["--shell-timeout"]) or None)
+ 	try:
+ 		conn.connect(addr)
+ 	except socket.error:
diff --git a/SPECS/fence-agents.spec b/SPECS/fence-agents.spec
index 57a8d55..3dedfba 100644
--- a/SPECS/fence-agents.spec
+++ b/SPECS/fence-agents.spec
@@ -29,7 +29,7 @@
 Name: fence-agents
 Summary: Set of unified programs capable of host isolation ("fencing")
 Version: 4.2.1
-Release: 62%{?alphatag:.%{alphatag}}%{?dist}
+Release: 63%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: https://github.com/ClusterLabs/fence-agents
@@ -120,6 +120,7 @@ Patch78: bz1470813-fencing-3-make-timeout-0-mean-forever.patch
 Patch79: bz1470813-fencing-4-make-timeout-0-mean-forever.patch
 Patch80: bz1841087-fence_scsi-dont-write-key-device-to-file.patch
 Patch81: bz1896827-fence_aws-add-imdsv2-support.patch
+Patch82: bz1914313-fence_zvmip-fix-disable-timeout.patch
 
 %if 0%{?fedora} || 0%{?rhel} > 7
 %global supportedagents amt_ws apc apc_snmp bladecenter brocade cisco_mds cisco_ucs compute drac5 eaton_snmp emerson eps evacuate hds_cb hpblade ibmblade ifmib ilo ilo_moonshot ilo_mp ilo_ssh intelmodular ipdu ipmilan kdump lpar mpath redfish rhevm rsa rsb sbd scsi vmware_rest vmware_soap wti
@@ -279,6 +280,7 @@ BuildRequires: python3-google-api-client
 %patch79 -p1
 %patch80 -p1
 %patch81 -p1
+%patch82 -p1
 
 # prevent compilation of something that won't get used anyway
 sed -i.orig 's|FENCE_ZVM=1|FENCE_ZVM=0|' configure.ac
@@ -1167,6 +1169,10 @@ Fence agent for IBM z/VM over IP.
 %endif
 
 %changelog
+* Mon Jan 11 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.2.1-63
+- fence_zvmip: fix disable-timeout not working correctly
+  Resolves: rhbz#1914313
+
 * Fri Nov 13 2020 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.2.1-62
 - fence_aws: add support for IMDSv2
   Resolves: rhbz#1896827