diff --git a/rebar.config b/rebar.config
index 092d6f1..9c6b44e 100644
--- a/rebar.config
+++ b/rebar.config
@@ -2,22 +2,9 @@
 %% vim:ts=4 sw=4 et ft=erlang
 {cover_enabled, true}.
 
-%% For rebar2 compat
 {deps,
  [
-  %% This uses an older erlware_commons version so retain compatibility with
-  %% rebar2. v0.16.1 introduced a 'cf' dependency, which seems to cause
-  %% breakage.
-  {erlware_commons,  ".*", {git, "git://github.com/erlware/erlware_commons.git",     {tag, "v0.15.0"}}},
-
-  {erlang_localtime, ".*", {git, "git://github.com/choptastic/erlang_localtime.git", {branch, master}}}
+  %% 0.21.0 only works with rebar3. It's overridden with rebar.config.script in rebar2
+  {erlware_commons, {git, "git://github.com/erlware/erlware_commons", {tag, "0.21.0"}}},
+  {qdate_localtime, {git, "git://github.com/choptastic/qdate_localtime", {tag, "1.1.0"}}}
  ]}.
-
-%% for rebar3
-{profiles,
- [{pkg,
-   [{deps,
-     [
-      erlware_commons,
-      erlang_localtime
-     ]}]}]}.
diff --git a/rebar.config.script b/rebar.config.script
new file mode 100644
index 0000000..a94f082
--- /dev/null
+++ b/rebar.config.script
@@ -0,0 +1,15 @@
+%% -*- mode: erlang -*-
+%% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 sts ft=erlang et
+
+case erlang:function_exported(rebar3, main, 1) of
+    true -> % rebar3
+        CONFIG;
+    false -> % rebar 2.x or older
+        %% Rebuild deps, possibly including those that have been moved to
+        %% profiles
+        [{deps, [
+            {erlware_commons, "", {git, "git://github.com/erlware/erlware_commons", {tag, "v0.15.0"}}},
+            {erlang_localtime, "", {git, "git://github.com/choptastic/erlang_localtime", {branch, master}}}
+        ]} | lists:keydelete(deps, 1, CONFIG)]
+end.
diff --git a/rebar3 b/rebar3
index 8a36476..d1dc07f 100755
Binary files a/rebar3 and b/rebar3 differ