diff --git a/ext/mysqli/mysqli_fe.c b/ext/mysqli/mysqli_fe.c
index fbf0a820a84..a5b2a13684c 100644
--- a/ext/mysqli/mysqli_fe.c
+++ b/ext/mysqli/mysqli_fe.c
@@ -496,6 +496,9 @@ const zend_function_entry mysqli_link_methods[] = {
 	PHP_FALIAS(next_result, mysqli_next_result, arginfo_mysqli_no_params)
 	PHP_FALIAS(options, mysqli_options, arginfo_class_mysqli_options)
 	PHP_FALIAS(ping, mysqli_ping, arginfo_mysqli_no_params)
+#if defined(MYSQLI_USE_MYSQLND)
+	ZEND_FENTRY(poll, ZEND_FN(mysqli_poll), arginfo_mysqli_poll, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
+#endif
 	PHP_FALIAS(prepare, mysqli_prepare, arginfo_class_mysqli_query)
 	PHP_FALIAS(query, mysqli_query, arginfo_class_mysqli_query)
 	PHP_FALIAS(real_connect, mysqli_real_connect, arginfo_class_mysqli_real_connect)
diff --git a/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
index 02e2d364da6..a3bd92fcfc7 100644
--- a/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
+++ b/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
@@ -61,6 +61,7 @@ require_once('skipifconnectfailure.inc');
 		/* $expected_methods['get_client_stats']	= true; */
 		$expected_methods['get_connection_stats']	= true;
 		$expected_methods['reap_async_query']	= true;
+		$expected_methods['poll'] = true;
 	} else {
 		// libmysql only
 		if (function_exists('mysqli_ssl_set'))
diff --git a/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt b/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt
index cb94483846b..3ce2b588f80 100644
--- a/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt
+++ b/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt
@@ -603,6 +603,57 @@ Modifiers: 256
 Number of Parameters: 0
 Number of Required Parameters: 0
 
+Inspecting method 'poll'
+isFinal: no
+isAbstract: no
+isPublic: yes
+isPrivate: no
+isProtected: no
+isStatic: yes
+isConstructor: no
+isDestructor: no
+isInternal: yes
+isUserDefined: no
+returnsReference: no
+Modifiers: 257
+Number of Parameters: 5
+Number of Required Parameters: 4
+
+Inspecting parameter 'read' of method 'poll'
+isArray: yes
+allowsNull: yes
+isPassedByReference: yes
+isOptional: no
+isDefaultValueAvailable: no
+
+Inspecting parameter 'write' of method 'poll'
+isArray: yes
+allowsNull: yes
+isPassedByReference: yes
+isOptional: no
+isDefaultValueAvailable: no
+
+Inspecting parameter 'error' of method 'poll'
+isArray: yes
+allowsNull: yes
+isPassedByReference: yes
+isOptional: no
+isDefaultValueAvailable: no
+
+Inspecting parameter 'sec' of method 'poll'
+isArray: no
+allowsNull: no
+isPassedByReference: no
+isOptional: no
+isDefaultValueAvailable: no
+
+Inspecting parameter 'usec' of method 'poll'
+isArray: no
+allowsNull: no
+isPassedByReference: no
+isOptional: yes
+isDefaultValueAvailable: no
+
 Inspecting method 'prepare'
 isFinal: no
 isAbstract: no