diff --git a/doc/openocd.texi b/doc/openocd.texi
index 1b247578e..c3963d6cb 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -3298,7 +3298,7 @@ See @file{interface/sysfsgpio-raspberrypi.cfg} for a sample config.
 OpenJTAG compatible USB adapter.
 This defines some driver-specific commands:
 
-@deffn {Config Command} {openjtag_variant} variant
+@deffn {Config Command} {openjtag variant} variant
 Specifies the variant of the OpenJTAG adapter (see @uref{http://www.openjtag.org/}).
 Currently valid @var{variant} values include:
 
@@ -3309,7 +3309,7 @@ Currently valid @var{variant} values include:
 @end itemize
 @end deffn
 
-@deffn {Config Command} {openjtag_device_desc} string
+@deffn {Config Command} {openjtag device_desc} string
 The USB device description string of the adapter.
 This value is only used with the standard variant.
 @end deffn
diff --git a/src/jtag/drivers/openjtag.c b/src/jtag/drivers/openjtag.c
index 7efb0e5e0..123134f51 100644
--- a/src/jtag/drivers/openjtag.c
+++ b/src/jtag/drivers/openjtag.c
@@ -870,16 +870,16 @@ COMMAND_HANDLER(openjtag_handle_variant_command)
 	return ERROR_OK;
 }
 
-static const struct command_registration openjtag_command_handlers[] = {
+static const struct command_registration openjtag_subcommand_handlers[] = {
 	{
-		.name = "openjtag_device_desc",
+		.name = "device_desc",
 		.handler = openjtag_handle_device_desc_command,
 		.mode = COMMAND_CONFIG,
 		.help = "set the USB device description of the OpenJTAG",
 		.usage = "description-string",
 	},
 	{
-		.name = "openjtag_variant",
+		.name = "variant",
 		.handler = openjtag_handle_variant_command,
 		.mode = COMMAND_CONFIG,
 		.help = "set the OpenJTAG variant",
@@ -888,6 +888,17 @@ static const struct command_registration openjtag_command_handlers[] = {
 	COMMAND_REGISTRATION_DONE
 };
 
+static const struct command_registration openjtag_command_handlers[] = {
+	{
+		.name = "openjtag",
+		.mode = COMMAND_ANY,
+		.help = "perform openjtag management",
+		.chain = openjtag_subcommand_handlers,
+		.usage = "",
+	},
+	COMMAND_REGISTRATION_DONE
+};
+
 static struct jtag_interface openjtag_interface = {
 	.execute_queue = openjtag_execute_queue,
 };
diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index d6413e48f..f2e4ec353 100644
--- a/src/jtag/startup.tcl
+++ b/src/jtag/startup.tcl
@@ -261,6 +261,18 @@ proc ftdi_tdo_sample_edge args {
 	eval ftdi tdo_sample_edge $args
 }
 
+lappend _telnet_autocomplete_skip openjtag_device_desc
+proc openjtag_device_desc args {
+	echo "DEPRECATED! use 'openjtag device_desc' not 'openjtag_device_desc'"
+	eval openjtag device_desc $args
+}
+
+lappend _telnet_autocomplete_skip openjtag_variant
+proc openjtag_variant args {
+	echo "DEPRECATED! use 'openjtag variant' not 'openjtag_variant'"
+	eval openjtag variant $args
+}
+
 lappend _telnet_autocomplete_skip parport_port
 proc parport_port args {
 	echo "DEPRECATED! use 'parport port' not 'parport_port'"