diff --git a/libmysql.version b/libmysql.version
index d547b5d..dc68053 100644
--- a/libmysql.version
+++ b/libmysql.version
@@ -146,3 +146,98 @@ libmysqlclient_18 {
 # PHP's mysqli.so requires this (via the ER() macro)
 	mysql_client_errors;
 };
+
+# symbols specific for mariadb
+libmysqlclient_18_mariadb {
+  global:
+    # symbols related to non-blocking operations
+    # documented here: https://kb.askmonty.org/en/non-blocking-api-reference/
+	mysql_get_socket;
+	mysql_get_timeout_value;
+	mysql_get_timeout_value;
+	mysql_real_connect_start;
+	mysql_real_connect_cont;
+	mysql_real_query_start;
+	mysql_real_query_cont;
+	mysql_fetch_row_start;
+	mysql_fetch_row_cont;
+	mysql_set_character_set_start;
+	mysql_set_character_set_cont;
+	mysql_select_db_start;
+	mysql_select_db_cont;
+	mysql_send_query_start;
+	mysql_send_query_cont;
+	mysql_store_result_start;
+	mysql_store_result_cont;
+	mysql_free_result_start;
+	mysql_free_result_cont;
+	mysql_close_start;
+	mysql_close_cont;
+	mysql_change_user_start;
+	mysql_change_user_cont;
+	mysql_query_start;
+	mysql_query_cont;
+	mysql_shutdown_start;
+	mysql_shutdown_cont;
+	mysql_dump_debug_info_start;
+	mysql_dump_debug_info_cont;
+	mysql_refresh_start;
+	mysql_refresh_cont;
+	mysql_kill_start;
+	mysql_kill_cont;
+	mysql_set_server_option_start;
+	mysql_set_server_option_cont;
+	mysql_ping_start;
+	mysql_ping_cont;
+	mysql_stat_start;
+	mysql_stat_cont;
+	mysql_list_dbs_start;
+	mysql_list_dbs_cont;
+	mysql_list_tables_start;
+	mysql_list_tables_cont;
+	mysql_list_processes_start;
+	mysql_list_processes_cont;
+	mysql_list_fields_start;
+	mysql_list_fields_cont;
+	mysql_read_query_result_start;
+	mysql_read_query_result_cont;
+	mysql_stmt_prepare_start;
+	mysql_stmt_prepare_cont;
+	mysql_stmt_execute_start;
+	mysql_stmt_execute_cont;
+	mysql_stmt_fetch_start;
+	mysql_stmt_fetch_cont;
+	mysql_stmt_store_result_start;
+	mysql_stmt_store_result_cont;
+	mysql_stmt_close_start;
+	mysql_stmt_close_cont;
+	mysql_stmt_reset_start;
+	mysql_stmt_reset_cont;
+	mysql_stmt_free_result_start;
+	mysql_stmt_free_result_cont;
+	mysql_stmt_send_long_data_start;
+	mysql_stmt_send_long_data_cont;
+	mysql_commit_start;
+	mysql_commit_cont;
+	mysql_rollback_start;
+	mysql_rollback_cont;
+	mysql_autocommit_start;
+	mysql_autocommit_cont;
+	mysql_next_result_start;
+	mysql_next_result_cont;
+	mysql_stmt_next_result_start;
+	mysql_stmt_next_result_cont;
+    # dynamic columns API
+    # documented here: https://kb.askmonty.org/en/dynamic-columns-api/
+    # currently only documentation for mariadb-10.0.x available, but
+    # upstream promissed adding 5.5.x version as well
+	dynamic_column_create;
+	dynamic_column_create_many;
+	dynamic_column_update;
+	dynamic_column_update_many;
+	dynamic_column_delete;
+	dynamic_column_exists;
+	dynamic_column_list;
+	dynamic_column_get;
+	dynamic_column_prepare_decimal;
+};
diff --git a/mariadb.spec b/mariadb.spec
index 5cba684..febdcb2 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -793,6 +793,8 @@ fi
 - Use configured prefix value instead of guessing basedir
   in mysql_config
 Resolves: #916189
+- Export dynamic columns and non-blocking API functions documented
+  by upstream
 
 * Wed Feb 27 2013 Honza Horak <hhorak@redhat.com> 5.5.29-6
 - Fix sort_buffer_length option type