diff --git a/rebar.config b/rebar.config
index fe2dfe6ec..95dec9b93 100644
--- a/rebar.config
+++ b/rebar.config
@@ -143,12 +143,18 @@
                         {if_rebar3, sql},
                         {if_var_true, tools, tools}]}]}.
 
-{if_rebar3, {plugins, [rebar3_hex, {provider_asn1, "0.2.0"}]}}.
+{if_rebar3, {plugins, [rebar3_hex, {provider_asn1, "0.2.0"},
+                       {if_var_true, elixir, rebar_mix}]}}.
 {if_rebar3, {project_plugins, [configure_deps]}}.
 {if_not_rebar3, {plugins, [
                            deps_erl_opts, override_deps_versions2, override_opts, configure_deps
                           ]}}.
 
+{if_rebar3, {if_var_true, elixir,
+    {provider_hooks, [
+      {post, [{compile, {mix, consolidate_protocols}}]}
+    ]}}}.
+
 {sub_dirs, ["rel"]}.
 
 {keep_build_info, true}.
@@ -241,6 +247,7 @@
                    {copy, "rel/files/erl", "erts-\{\{erts_vsn\}\}/bin/erl"},
                    {template, "ejabberdctl.template", "bin/ejabberdctl"},
                    {copy, "_build/default/lib/ejabberd/ebin/Elixir.*", "lib/ejabberd-{{release_version}}/ebin/"},
+                   {copy, "{{base_dir}}/consolidated/*", "lib/ejabberd-{{release_version}}/ebin/"},
                    {copy, "inetrc", "conf/inetrc"},
                    {copy, "tools/captcha*.sh", "lib/ejabberd-\{\{release_version\}\}/priv/bin/"},
                    {copy, "rel/files/install_upgrade.escript", "bin/install_upgrade.escript"}]}