diff --git a/src/hci/commands/ifmgmt_cmd.c b/src/hci/commands/ifmgmt_cmd.c
index fde5fbb1..3b98be0e 100644
--- a/src/hci/commands/ifmgmt_cmd.c
+++ b/src/hci/commands/ifmgmt_cmd.c
@@ -143,11 +143,6 @@ static int ifopen_exec ( int argc, char **argv ) {
 	return ifcommon_exec ( ifopen_payload, "Open", argc, argv );
 }
 
-struct command ifopen_command __command = {
-	.name = "ifopen",
-	.exec = ifopen_exec,
-};
-
 /* "ifclose" command */
 
 static int ifclose_payload ( struct net_device *netdev ) {
@@ -159,11 +154,6 @@ static int ifclose_exec ( int argc, char **argv ) {
 	return ifcommon_exec ( ifclose_payload, "Close", argc, argv );
 }
 
-struct command ifclose_command __command = {
-	.name = "ifclose",
-	.exec = ifclose_exec,
-};
-
 /* "ifstat" command */
 
 static int ifstat_payload ( struct net_device *netdev ) {
@@ -176,7 +166,18 @@ static int ifstat_exec ( int argc, char **argv ) {
 			       argc, argv );
 }
 
-struct command ifstat_command __command = {
-	.name = "ifstat",
-	.exec = ifstat_exec,
+/** Interface management commands */
+struct command ifmgmt_commands[] __command = {
+	{
+		.name = "ifopen",
+		.exec = ifopen_exec,
+	},
+	{
+		.name = "ifclose",
+		.exec = ifclose_exec,
+	},
+	{
+		.name = "ifstat",
+		.exec = ifstat_exec,
+	},
 };