diff --git a/source3/rpcclient/cmd_wkssvc.c b/source3/rpcclient/cmd_wkssvc.c
index f9026255b3c..b1ffd5fc386 100644
--- a/source3/rpcclient/cmd_wkssvc.c
+++ b/source3/rpcclient/cmd_wkssvc.c
@@ -215,13 +215,60 @@ static WERROR cmd_wkssvc_enumerateusers(struct rpc_pipe_client *cli,
 
 struct cmd_set wkssvc_commands[] = {
 
-	{ "WKSSVC" },
-	{ "wkssvc_wkstagetinfo", RPC_RTYPE_WERROR, NULL, cmd_wkssvc_wkstagetinfo, &ndr_table_wkssvc, NULL, "Query WKSSVC Workstation Information", "" },
-	{ "wkssvc_getjoininformation", RPC_RTYPE_WERROR, NULL, cmd_wkssvc_getjoininformation, &ndr_table_wkssvc, NULL, "Query WKSSVC Join Information", "" },
-	{ "wkssvc_messagebuffersend", RPC_RTYPE_WERROR, NULL, cmd_wkssvc_messagebuffersend, &ndr_table_wkssvc, NULL, "Send WKSSVC message", "" },
-	{ "wkssvc_enumeratecomputernames", RPC_RTYPE_WERROR, NULL, cmd_wkssvc_enumeratecomputernames, &ndr_table_wkssvc, NULL, "Enumerate WKSSVC computer names", "" },
-	{ "wkssvc_enumerateusers", RPC_RTYPE_WERROR, NULL,
-	  cmd_wkssvc_enumerateusers, &ndr_table_wkssvc, NULL,
-	  "Enumerate WKSSVC users", "" },
-	{ NULL }
+	{
+		.name = "WKSSVC",
+	},
+	{
+		.name               = "wkssvc_wkstagetinfo",
+		.returntype         = RPC_RTYPE_WERROR,
+		.ntfn               = NULL,
+		.wfn                = cmd_wkssvc_wkstagetinfo,
+		.table              = &ndr_table_wkssvc,
+		.rpc_pipe           = NULL,
+		.description        = "Query WKSSVC Workstation Information",
+		.usage              = "",
+	},
+	{
+		.name               = "wkssvc_getjoininformation",
+		.returntype         = RPC_RTYPE_WERROR,
+		.ntfn               = NULL,
+		.wfn                = cmd_wkssvc_getjoininformation,
+		.table              = &ndr_table_wkssvc,
+		.rpc_pipe           = NULL,
+		.description        = "Query WKSSVC Join Information",
+		.usage              = "",
+	},
+	{
+		.name               = "wkssvc_messagebuffersend",
+		.returntype         = RPC_RTYPE_WERROR,
+		.ntfn               = NULL,
+		.wfn                = cmd_wkssvc_messagebuffersend,
+		.table              = &ndr_table_wkssvc,
+		.rpc_pipe           = NULL,
+		.description        = "Send WKSSVC message",
+		.usage              = "",
+	},
+	{
+		.name               = "wkssvc_enumeratecomputernames",
+		.returntype         = RPC_RTYPE_WERROR,
+		.ntfn               = NULL,
+		.wfn                = cmd_wkssvc_enumeratecomputernames,
+		.table              = &ndr_table_wkssvc,
+		.rpc_pipe           = NULL,
+		.description        = "Enumerate WKSSVC computer names",
+		.usage              = "",
+	},
+	{
+		.name               = "wkssvc_enumerateusers",
+		.returntype         = RPC_RTYPE_WERROR,
+		.ntfn               = NULL,
+		.wfn                = cmd_wkssvc_enumerateusers,
+		.table              = &ndr_table_wkssvc,
+		.rpc_pipe           = NULL,
+		.description        = "Enumerate WKSSVC users",
+		.usage              = "",
+	},
+	{
+		.name =NULL,
+	},
 };