diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index 657efb6f3a3f1..01d40b06a2778 100644
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -2991,6 +2991,9 @@ PHP_FUNCTION(ldap_get_option)
 #ifdef LDAP_OPT_X_TLS_PROTOCOL_MIN
 	case LDAP_OPT_X_TLS_PROTOCOL_MIN:
 #endif
+#ifdef LDAP_OPT_X_TLS_PROTOCOL_MAX
+	case LDAP_OPT_X_TLS_PROTOCOL_MAX:
+#endif
 #ifdef LDAP_OPT_X_KEEPALIVE_IDLE
 	case LDAP_OPT_X_KEEPALIVE_IDLE:
 	case LDAP_OPT_X_KEEPALIVE_PROBES:
@@ -3159,6 +3162,9 @@ PHP_FUNCTION(ldap_set_option)
 #ifdef LDAP_OPT_X_TLS_PROTOCOL_MIN
 	case LDAP_OPT_X_TLS_PROTOCOL_MIN:
 #endif
+#ifdef LDAP_OPT_X_TLS_PROTOCOL_MAX
+	case LDAP_OPT_X_TLS_PROTOCOL_MAX:
+#endif
 #ifdef LDAP_OPT_X_KEEPALIVE_IDLE
 	case LDAP_OPT_X_KEEPALIVE_IDLE:
 	case LDAP_OPT_X_KEEPALIVE_PROBES:
diff --git a/ext/ldap/ldap.stub.php b/ext/ldap/ldap.stub.php
index eb60b35b7ecb4..ecda9be7496a9 100644
--- a/ext/ldap/ldap.stub.php
+++ b/ext/ldap/ldap.stub.php
@@ -358,6 +358,20 @@
      */
     const LDAP_OPT_X_TLS_PROTOCOL_TLS1_2 = UNKNOWN;
 #endif
+#ifdef LDAP_OPT_X_TLS_PROTOCOL_TLS1_3
+    /**
+     * @var int
+     * @cvalue LDAP_OPT_X_TLS_PROTOCOL_TLS1_3
+     */
+    const LDAP_OPT_X_TLS_PROTOCOL_TLS1_3 = UNKNOWN;
+#endif
+#ifdef LDAP_OPT_X_TLS_PROTOCOL_MAX
+    /**
+     * @var int
+     * @cvalue LDAP_OPT_X_TLS_PROTOCOL_MAX
+     */
+    const LDAP_OPT_X_TLS_PROTOCOL_MAX = UNKNOWN;
+#endif
 
 #ifdef LDAP_OPT_X_TLS_PACKAGE
     /**
diff --git a/ext/ldap/ldap_arginfo.h b/ext/ldap/ldap_arginfo.h
index f3249e0e3e305..7333ccc87c4f1 100644
--- a/ext/ldap/ldap_arginfo.h
+++ b/ext/ldap/ldap_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: fec87d81c21ac5d56e62a5e0b4bbe673ea76edd5 */
+ * Stub hash: bd41c14d3e28c21238365a28d1ee9806521719af */
 
 #if defined(HAVE_ORALDAP)
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_ldap_connect, 0, 0, LDAP\\Connection, MAY_BE_FALSE)
@@ -754,6 +754,12 @@ static void register_ldap_symbols(int module_number)
 #if defined(LDAP_OPT_X_TLS_PROTOCOL_MIN)
 	REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_PROTOCOL_TLS1_2", LDAP_OPT_X_TLS_PROTOCOL_TLS1_2, CONST_PERSISTENT);
 #endif
+#if defined(LDAP_OPT_X_TLS_PROTOCOL_TLS1_3)
+	REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_PROTOCOL_TLS1_3", LDAP_OPT_X_TLS_PROTOCOL_TLS1_3, CONST_PERSISTENT);
+#endif
+#if defined(LDAP_OPT_X_TLS_PROTOCOL_MAX)
+	REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_PROTOCOL_MAX", LDAP_OPT_X_TLS_PROTOCOL_MAX, CONST_PERSISTENT);
+#endif
 #if defined(LDAP_OPT_X_TLS_PACKAGE)
 	REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_PACKAGE", LDAP_OPT_X_TLS_PACKAGE, CONST_PERSISTENT);
 #endif
diff --git a/ext/ldap/tests/ldap_set_option_tls_protocol_max_basic.phpt b/ext/ldap/tests/ldap_set_option_tls_protocol_max_basic.phpt
new file mode 100644
index 0000000000000..7fc24684c8f14
--- /dev/null
+++ b/ext/ldap/tests/ldap_set_option_tls_protocol_max_basic.phpt
@@ -0,0 +1,39 @@
+--TEST--
+ldap_set_option() - Basic test for TLS protocol max ldap option
+--CREDITS--
+Chad Sikorra <Chad.Sikorra@gmail.com>
+--EXTENSIONS--
+ldap
+--FILE--
+<?php
+require "connect.inc";
+$link = ldap_connect($uri);
+
+foreach([
+    LDAP_OPT_X_TLS_PROTOCOL_SSL2,
+    LDAP_OPT_X_TLS_PROTOCOL_SSL3,
+    LDAP_OPT_X_TLS_PROTOCOL_TLS1_0,
+    LDAP_OPT_X_TLS_PROTOCOL_TLS1_1,
+    LDAP_OPT_X_TLS_PROTOCOL_TLS1_2,
+    LDAP_OPT_X_TLS_PROTOCOL_TLS1_3,
+] as $option) {
+    $result = ldap_set_option($link, LDAP_OPT_X_TLS_PROTOCOL_MAX, $option);
+    var_dump($result);
+
+    ldap_get_option($link, LDAP_OPT_X_TLS_PROTOCOL_MAX, $optionval);
+    var_dump($optionval);
+}
+?>
+--EXPECT--
+bool(true)
+int(512)
+bool(true)
+int(768)
+bool(true)
+int(769)
+bool(true)
+int(770)
+bool(true)
+int(771)
+bool(true)
+int(772)
diff --git a/ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt b/ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt
index 44abaeb9d9a3b..5c4da7368b62d 100644
--- a/ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt
+++ b/ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt
@@ -15,6 +15,7 @@ foreach([
     LDAP_OPT_X_TLS_PROTOCOL_TLS1_0,
     LDAP_OPT_X_TLS_PROTOCOL_TLS1_1,
     LDAP_OPT_X_TLS_PROTOCOL_TLS1_2,
+    LDAP_OPT_X_TLS_PROTOCOL_TLS1_3,
 ] as $option) {
     $result = ldap_set_option($link, LDAP_OPT_X_TLS_PROTOCOL_MIN, $option);
     var_dump($result);
@@ -34,3 +35,5 @@ bool(true)
 int(770)
 bool(true)
 int(771)
+bool(true)
+int(772)