diff --git a/src/jtag/drivers/ulink.c b/src/jtag/drivers/ulink.c
index b2fedbefd..3ae5cac62 100644
--- a/src/jtag/drivers/ulink.c
+++ b/src/jtag/drivers/ulink.c
@@ -2258,9 +2258,9 @@ COMMAND_HANDLER(ulink_download_firmware_handler)
 
 /*************************** Command Registration **************************/
 
-static const struct command_registration ulink_command_handlers[] = {
+static const struct command_registration ulink_subcommand_handlers[] = {
 	{
-		.name = "ulink_download_firmware",
+		.name = "download_firmware",
 		.handler = &ulink_download_firmware_handler,
 		.mode = COMMAND_EXEC,
 		.help = "download firmware image to ULINK device",
@@ -2269,6 +2269,17 @@ static const struct command_registration ulink_command_handlers[] = {
 	COMMAND_REGISTRATION_DONE,
 };
 
+static const struct command_registration ulink_command_handlers[] = {
+	{
+		.name = "ulink",
+		.mode = COMMAND_ANY,
+		.help = "perform ulink management",
+		.chain = ulink_subcommand_handlers,
+		.usage = "",
+	},
+	COMMAND_REGISTRATION_DONE
+};
+
 static struct jtag_interface ulink_interface = {
 	.execute_queue = ulink_execute_queue,
 };
diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index d4226c686..19ce510c8 100644
--- a/src/jtag/startup.tcl
+++ b/src/jtag/startup.tcl
@@ -321,5 +321,10 @@ proc xlnx_pcie_xvc_config args {
 	eval xlnx_pcie_xvc config $args
 }
 
+lappend _telnet_autocomplete_skip ulink_download_firmware
+proc ulink_download_firmware args {
+	echo "DEPRECATED! use 'ulink download_firmware' not 'ulink_download_firmware'"
+	eval ulink download_firmware $args
+}
 
 # END MIGRATION AIDS