diff --git a/Zend/tests/jmpznz_relative_offsets.phpt b/Zend/tests/jmpznz_relative_offsets.phpt
new file mode 100644
index 00000000000..c6b67b23f27
--- /dev/null
+++ b/Zend/tests/jmpznz_relative_offsets.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Check for correct treatment of relative JMPZNZ offsets when copying opline
+--FILE--
+<?php
+function test($c) {
+    L1:
+    if ($c) {
+        goto L1;
+        goto L1;
+    }
+}
+test(false);
+?>
+===DONE===
+--EXPECT--
+===DONE===
diff --git a/ext/opcache/Optimizer/pass3.c b/ext/opcache/Optimizer/pass3.c
index f98c41848c2..1b508a5da2f 100644
--- a/ext/opcache/Optimizer/pass3.c
+++ b/ext/opcache/Optimizer/pass3.c
@@ -95,6 +95,10 @@ void zend_optimizer_pass3(zend_op_array *op_array, zend_optimizer_ctx *ctx)
 						ZVAL_COPY(&zv, &ZEND_OP1_LITERAL(opline));
 						opline->op1.constant = zend_optimizer_add_literal(op_array, &zv);
 					}
+					/* Jump addresses may be encoded as offsets, recompute them. */
+					ZEND_SET_OP_JMP_ADDR(opline, opline->op2, ZEND_OP2_JMP_ADDR(target));
+					opline->extended_value = ZEND_OPLINE_TO_OFFSET(opline,
+						ZEND_OFFSET_TO_OPLINE(target, target->extended_value));
 					goto optimize_jmpznz;
 				} else if ((target->opcode == ZEND_RETURN ||
 				            target->opcode == ZEND_RETURN_BY_REF ||