diff --git a/commands.go b/commands.go
index b9343301c..409f4d85d 100644
--- a/commands.go
+++ b/commands.go
@@ -42,8 +42,9 @@ func init() {
 	// that to match.
 
 	PlumbingCommands = map[string]struct{}{
-		"state": struct{}{}, // includes all subcommands
-		"debug": struct{}{}, // includes all subcommands
+		"state":        struct{}{}, // includes all subcommands
+		"debug":        struct{}{}, // includes all subcommands
+		"force-unlock": struct{}{},
 	}
 
 	Commands = map[string]cli.CommandFactory{
@@ -105,12 +106,6 @@ func init() {
 			}, nil
 		},
 
-		"force-unlock": func() (cli.Command, error) {
-			return &command.UnlockCommand{
-				Meta: meta,
-			}, nil
-		},
-
 		"get": func() (cli.Command, error) {
 			return &command.GetCommand{
 				Meta: meta,
@@ -215,6 +210,12 @@ func init() {
 			}, nil
 		},
 
+		"force-unlock": func() (cli.Command, error) {
+			return &command.UnlockCommand{
+				Meta: meta,
+			}, nil
+		},
+
 		"state": func() (cli.Command, error) {
 			return &command.StateCommand{}, nil
 		},