diff --git a/ChangeLog b/ChangeLog
index 7b348b2..c9373c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+btrbk-current
+
+  * ssh_filter_btrbk.sh uses new exit statuses on failures (1 when the
+    SSH command was rejected, 2 when the program’s arguments could not
+    be parsed).
+
 btrbk-0.32.5
 
   * Correct handling of zero-size raw info file (close #491).
diff --git a/ssh_filter_btrbk.sh b/ssh_filter_btrbk.sh
index 20ef87c..94cb69c 100755
--- a/ssh_filter_btrbk.sh
+++ b/ssh_filter_btrbk.sh
@@ -42,7 +42,7 @@ reject_and_die()
     local reason="$1"
     log_cmd 'auth.err' 'btrbk REJECT' "$reason"
     printf 'ERROR: ssh_filter_btrbk.sh: ssh command rejected: %s: %s\n' "$reason" "$SSH_ORIGINAL_COMMAND" 1>&2
-    exit 255
+    exit 1
 }
 
 run_cmd()
@@ -166,7 +166,7 @@ while [ "$#" -ge 1 ]; do
 
       *)
           printf 'ERROR: ssh_filter_btrbk.sh: failed to parse command line option: %s\n' "$key" 1>&2
-          exit 255
+          exit 2
           ;;
     esac
     shift