diff --git a/community-mysql.spec b/community-mysql.spec
index 8e5bd2d..94e9574 100644
--- a/community-mysql.spec
+++ b/community-mysql.spec
@@ -73,7 +73,7 @@
 
 Name:             community-mysql
 Version:          8.0.21
-Release:          9%{?with_debug:.debug}%{?dist}
+Release:          10%{?with_debug:.debug}%{?dist}
 Summary:          MySQL client programs and shared libraries
 URL:              http://www.mysql.com
 
@@ -794,7 +794,37 @@ fi
 %dir %{_datadir}/%{pkg_name}
 %endif
 
-%{_libdir}/mysql/plugin
+%dir %{_libdir}/mysql/plugin
+%{_libdir}/mysql/plugin/adt_null.so
+%{_libdir}/mysql/plugin/auth_socket.so
+%{_libdir}/mysql/plugin/component_audit_api_message_emit.so
+%{_libdir}/mysql/plugin/component_log_filter_dragnet.so
+%{_libdir}/mysql/plugin/component_log_sink_json.so
+%{_libdir}/mysql/plugin/component_log_sink_syseventlog.so
+%{_libdir}/mysql/plugin/component_mysqlbackup.so
+%{_libdir}/mysql/plugin/component_validate_password.so
+%{_libdir}/mysql/plugin/connection_control.so
+%{_libdir}/mysql/plugin/daemon_example.ini
+%{_libdir}/mysql/plugin/ddl_rewriter.so
+%{_libdir}/mysql/plugin/group_replication.so
+%{_libdir}/mysql/plugin/ha_example.so
+%{_libdir}/mysql/plugin/ha_mock.so
+%{_libdir}/mysql/plugin/innodb_engine.so
+%{_libdir}/mysql/plugin/keyring_file.so
+%{_libdir}/mysql/plugin/keyring_udf.so
+%{_libdir}/mysql/plugin/libmemcached.so
+%{_libdir}/mysql/plugin/locking_service.so
+%{_libdir}/mysql/plugin/mypluglib.so
+%{_libdir}/mysql/plugin/mysql_clone.so
+%{_libdir}/mysql/plugin/mysql_no_login.so
+%{_libdir}/mysql/plugin/rewrite_example.so
+%{_libdir}/mysql/plugin/rewriter.so
+%{_libdir}/mysql/plugin/semisync_master.so
+%{_libdir}/mysql/plugin/semisync_slave.so
+%{_libdir}/mysql/plugin/validate_password.so
+%{_libdir}/mysql/plugin/version_token.so
+# List of plugins we don't ship but upstream does:
+#%%{_libdir}/mysql/plugin/libpluginmecab.so
 
 %{_mandir}/man1/ibd2sdi.1*
 %{_mandir}/man1/myisamchk.1*
@@ -857,9 +887,92 @@ fi
 %{_bindir}/mysqld_safe
 %{_bindir}/comp_err
 %attr(-,mysql,mysql) %{_datadir}/mysql-test
+
+%dir %{_libdir}/mysql/plugin
+%{_libdir}/mysql/plugin/auth.so
+%{_libdir}/mysql/plugin/auth_test_plugin.so
+%{_libdir}/mysql/plugin/component_example_component1.so
+%{_libdir}/mysql/plugin/component_example_component2.so
+%{_libdir}/mysql/plugin/component_example_component3.so
+%{_libdir}/mysql/plugin/component_log_sink_test.so
+%{_libdir}/mysql/plugin/component_mysqlx_global_reset.so
+%{_libdir}/mysql/plugin/component_pfs_example_component_population.so
+%{_libdir}/mysql/plugin/component_pfs_example.so
+%{_libdir}/mysql/plugin/component_test_audit_api_message.so
+%{_libdir}/mysql/plugin/component_test_backup_lock_service.so
+%{_libdir}/mysql/plugin/component_test_component_deinit.so
+%{_libdir}/mysql/plugin/component_test_host_application_signal.so
+%{_libdir}/mysql/plugin/component_test_mysql_current_thread_reader.so
+%{_libdir}/mysql/plugin/component_test_mysql_runtime_error.so
+%{_libdir}/mysql/plugin/component_test_pfs_notification.so
+%{_libdir}/mysql/plugin/component_test_pfs_resource_group.so
+%{_libdir}/mysql/plugin/component_test_status_var_service_int.so
+%{_libdir}/mysql/plugin/component_test_status_var_service_reg_only.so
+%{_libdir}/mysql/plugin/component_test_status_var_service.so
+%{_libdir}/mysql/plugin/component_test_status_var_service_str.so
+%{_libdir}/mysql/plugin/component_test_status_var_service_unreg_only.so
+%{_libdir}/mysql/plugin/component_test_string_service_charset.so
+%{_libdir}/mysql/plugin/component_test_string_service_long.so
+%{_libdir}/mysql/plugin/component_test_string_service.so
+%{_libdir}/mysql/plugin/component_test_system_variable_source.so
+%{_libdir}/mysql/plugin/component_test_sys_var_service_int.so
+%{_libdir}/mysql/plugin/component_test_sys_var_service_same.so
+%{_libdir}/mysql/plugin/component_test_sys_var_service.so
+%{_libdir}/mysql/plugin/component_test_sys_var_service_str.so
+%{_libdir}/mysql/plugin/component_test_udf_registration.so
+%{_libdir}/mysql/plugin/component_test_udf_services.so
+%{_libdir}/mysql/plugin/component_udf_reg_3_func.so
+%{_libdir}/mysql/plugin/component_udf_reg_avg_func.so
+%{_libdir}/mysql/plugin/component_udf_reg_int_func.so
+%{_libdir}/mysql/plugin/component_udf_reg_int_same_func.so
+%{_libdir}/mysql/plugin/component_udf_reg_only_3_func.so
+%{_libdir}/mysql/plugin/component_udf_reg_real_func.so
+%{_libdir}/mysql/plugin/component_udf_unreg_3_func.so
+%{_libdir}/mysql/plugin/component_udf_unreg_int_func.so
+%{_libdir}/mysql/plugin/component_udf_unreg_real_func.so
+%{_libdir}/mysql/plugin/libdaemon_example.so
+%{_libdir}/mysql/plugin/libtest_framework.so
+%{_libdir}/mysql/plugin/libtest_services.so
+%{_libdir}/mysql/plugin/libtest_services_threaded.so
+%{_libdir}/mysql/plugin/libtest_session_attach.so
+%{_libdir}/mysql/plugin/libtest_session_detach.so
+%{_libdir}/mysql/plugin/libtest_session_info.so
+%{_libdir}/mysql/plugin/libtest_session_in_thd.so
+%{_libdir}/mysql/plugin/libtest_sql_2_sessions.so
+%{_libdir}/mysql/plugin/libtest_sql_all_col_types.so
+%{_libdir}/mysql/plugin/libtest_sql_cmds_1.so
+%{_libdir}/mysql/plugin/libtest_sql_commit.so
+%{_libdir}/mysql/plugin/libtest_sql_complex.so
+%{_libdir}/mysql/plugin/libtest_sql_errors.so
+%{_libdir}/mysql/plugin/libtest_sql_lock.so
+%{_libdir}/mysql/plugin/libtest_sql_processlist.so
+%{_libdir}/mysql/plugin/libtest_sql_replication.so
+%{_libdir}/mysql/plugin/libtest_sql_reset_connection.so
+%{_libdir}/mysql/plugin/libtest_sql_shutdown.so
+%{_libdir}/mysql/plugin/libtest_sql_sqlmode.so
+%{_libdir}/mysql/plugin/libtest_sql_stmt.so
+%{_libdir}/mysql/plugin/libtest_sql_stored_procedures_functions.so
+%{_libdir}/mysql/plugin/libtest_sql_views_triggers.so
+%{_libdir}/mysql/plugin/libtest_x_sessions_deinit.so
+%{_libdir}/mysql/plugin/libtest_x_sessions_init.so
+%{_libdir}/mysql/plugin/pfs_example_plugin_employee.so
+%{_libdir}/mysql/plugin/qa_auth_client.so
+%{_libdir}/mysql/plugin/qa_auth_interface.so
+%{_libdir}/mysql/plugin/qa_auth_server.so
+%{_libdir}/mysql/plugin/replication_observers_example_plugin.so
+%{_libdir}/mysql/plugin/test_security_context.so
+%{_libdir}/mysql/plugin/test_services_host_application_signal.so
+%{_libdir}/mysql/plugin/test_services_plugin_registry.so
+%{_libdir}/mysql/plugin/test_udf_services.so
+%{_libdir}/mysql/plugin/udf_example.so
 %endif
 
 %changelog
+* Mon Aug 24 2020 Michal Schorm <mschorm@redhat.com> - 8.0.21-10
+- Fix the filelist. A number of shared libraries in the plugindir
+  are part of the testsuite and thus should reside in *-test subpackage
+  It will be best to keep the file list explicit to avoid this in the future
+
 * Tue Aug 18 2020 Michal Schorm <mschorm@redhat.com> - 8.0.21-9
 - I encounter the ARM memory exaustion in the end
   Looks like it is only issue on some machines