diff --git a/src/doveadm/doveadm-cmd.c b/src/doveadm/doveadm-cmd.c
index 11d05fbb5b..61d922252f 100644
--- a/src/doveadm/doveadm-cmd.c
+++ b/src/doveadm/doveadm-cmd.c
@@ -12,8 +12,6 @@
 #include <getopt.h>
 
 static struct doveadm_cmd *doveadm_commands[] = {
-	&doveadm_cmd_stop,
-	&doveadm_cmd_reload,
 	&doveadm_cmd_who,
 	&doveadm_cmd_penalty,
 	&doveadm_cmd_kick,
@@ -24,6 +22,8 @@ static struct doveadm_cmd *doveadm_commands[] = {
 };
 
 static struct doveadm_cmd_ver2 *doveadm_commands_ver2[] = {
+	&doveadm_cmd_stop_ver2,
+	&doveadm_cmd_reload_ver2
 };
 
 ARRAY_TYPE(doveadm_cmd) doveadm_cmds;
diff --git a/src/doveadm/doveadm-cmd.h b/src/doveadm/doveadm-cmd.h
index 29c82cc762..1550135c85 100644
--- a/src/doveadm/doveadm-cmd.h
+++ b/src/doveadm/doveadm-cmd.h
@@ -62,8 +62,6 @@ struct doveadm_cmd_ver2 {
 ARRAY_DEFINE_TYPE(doveadm_cmd, struct doveadm_cmd);
 extern ARRAY_TYPE(doveadm_cmd) doveadm_cmds;
 
-extern struct doveadm_cmd doveadm_cmd_stop;
-extern struct doveadm_cmd doveadm_cmd_reload;
 ARRAY_DEFINE_TYPE(doveadm_cmd_ver2, struct doveadm_cmd_ver2);
 extern ARRAY_TYPE(doveadm_cmd_ver2) doveadm_cmds_ver2;
 
@@ -119,4 +117,7 @@ bool doveadm_cmd_param_str(int argc, const struct doveadm_cmd_param* params, con
 bool doveadm_cmd_param_array(int argc, struct doveadm_cmd_param* params, const char *name, ARRAY_TYPE(const_string)** value);
 bool doveadm_cmd_param_istream(int argc, struct doveadm_cmd_param* params, const char *name, struct istream** value);
 
+extern struct doveadm_cmd_ver2 doveadm_cmd_stop_ver2;
+extern struct doveadm_cmd_ver2 doveadm_cmd_reload_ver2;
+
 #endif
diff --git a/src/doveadm/doveadm-master.c b/src/doveadm/doveadm-master.c
index dcfead3058..41a28c8137 100644
--- a/src/doveadm/doveadm-master.c
+++ b/src/doveadm/doveadm-master.c
@@ -84,10 +84,18 @@ static void cmd_reload(int argc ATTR_UNUSED, char *argv[] ATTR_UNUSED)
 	doveadm_master_send_signal(SIGHUP);
 }
 
-struct doveadm_cmd doveadm_cmd_stop = {
-	cmd_stop, "stop", ""
+struct doveadm_cmd_ver2 doveadm_cmd_stop_ver2 = {
+	.old_cmd = cmd_stop,
+	.name = "stop",
+	.usage = "",
+DOVEADM_CMD_PARAMS_START
+DOVEADM_CMD_PARAMS_END
 };
 
-struct doveadm_cmd doveadm_cmd_reload = {
-	cmd_reload, "reload", ""
+struct doveadm_cmd_ver2 doveadm_cmd_reload_ver2 = {
+        .old_cmd = cmd_reload,
+        .name = "reload",
+        .usage = "",
+DOVEADM_CMD_PARAMS_START
+DOVEADM_CMD_PARAMS_END
 };