diff --git a/bootstrap b/bootstrap
index bcfee1edf..9b7af87c1 100755
--- a/bootstrap
+++ b/bootstrap
@@ -177,7 +177,7 @@ compile_yrl_file(File) ->
     {ok, _} = yecc:file(File).
 
 compile_erl_file(File, Opts) ->
-    case compile:file(File, Opts) of
+    case compile:file(File, [nowarn_deprecated_catch | Opts]) of
         {ok, _Mod} ->
             ok;
         {ok, _Mod, []} ->
diff --git a/rebar.config b/rebar.config
index 8db24f49a..82fb6cd3c 100644
--- a/rebar.config
+++ b/rebar.config
@@ -5,6 +5,8 @@
 {project_app_dirs, ["apps/*","lib/*",".","vendor/*"]}.
 {project_plugin_dirs, ["plugins/*","vendor_plugins/*"]}.
 
+{erl_opts, [nowarn_deprecated_catch]}.
+
 %% Duplicated from apps/rebar3:
 %% - we want people who rely on rebar3 as a dependency to still be able
 %%   to fetch it with git_subdir and have it work
@@ -18,7 +20,8 @@
 {escript_incl_priv, [{relx, "templates/*"},
                      {rebar, "templates/*"}]}.
 
-{overrides, [{add, relx, [{erl_opts, [{d, 'RLX_LOG', rebar_log}]}]}]}.
+{overrides, [{override, erlware_commons, [{erl_opts, [nowarn_deprecated_catch]}]},
+             {add, relx, [{erl_opts, [{d, 'RLX_LOG', rebar_log}]}]}]}.
 
 {profiles, [
     %% Only works at the top-level