diff --git a/libexec/rbenv-set-default b/libexec/rbenv-set-default
index cff1eb09..cf68d57e 100755
--- a/libexec/rbenv-set-default
+++ b/libexec/rbenv-set-default
@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
 set -e
 
-echo "set-default has been renamed to default" >&2
-rbenv-default "$@"
+{ echo "rbenv: warning: \`set-default' has been renamed to \`default'"
+  echo "       and will be removed in v0.3.0"
+  echo
+} >&2
+
+exec rbenv-default "$@"
diff --git a/libexec/rbenv-set-local b/libexec/rbenv-set-local
index a93ec24e..28d5961f 100755
--- a/libexec/rbenv-set-local
+++ b/libexec/rbenv-set-local
@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
 set -e
 
-echo "set-local has been renamed to local" >&2
-rbenv-local "$@"
+{ echo "rbenv: warning: \`set-local' has been renamed to \`local'"
+  echo "       and will be removed in v0.3.0"
+  echo
+} >&2
+
+exec rbenv-local "$@"