diff --git a/src/hci/commands/sanboot_cmd.c b/src/hci/commands/sanboot_cmd.c
index ec7f5acf..1f11cc2d 100644
--- a/src/hci/commands/sanboot_cmd.c
+++ b/src/hci/commands/sanboot_cmd.c
@@ -1,69 +1,77 @@
+/*
+ * Copyright (C) 2010 Michael Brown <mbrown@fensystems.co.uk>.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
 #include <stdio.h>
 #include <string.h>
 #include <getopt.h>
 #include <ipxe/command.h>
+#include <ipxe/parseopt.h>
 #include <usr/autoboot.h>
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-/**
- * "sanboot" command syntax message
+/** @file
+ *
+ * SAN commands
  *
- * @v argv		Argument list
  */
-static void sanboot_syntax ( char **argv ) {
-	printf ( "Usage:\n"
-		 "  %s <root-path>\n"
-		 "\n"
-		 "Boot from SAN target\n",
-		 argv[0] );
-}
+
+/** "sanboot" options */
+struct sanboot_options {};
+
+/** "sanboot" option list */
+static struct option_descriptor sanboot_opts[] = {};
+
+/** "sanboot" command descriptor */
+static struct command_descriptor sanboot_cmd =
+	COMMAND_DESC ( struct sanboot_options, sanboot_opts, 1, 1,
+		       "<root-path>", "Boot from SAN target" );
 
 /**
  * The "sanboot" command
  *
  * @v argc		Argument count
  * @v argv		Argument list
- * @ret rc		Exit code
+ * @ret rc		Return status code
  */
 static int sanboot_exec ( int argc, char **argv ) {
-	static struct option longopts[] = {
-		{ "help", 0, NULL, 'h' },
-		{ NULL, 0, NULL, 0 },
-	};
-	const char *root_path = NULL;
-	int c;
+	struct sanboot_options opts;
+	const char *root_path;
 	int rc;
 
 	/* Parse options */
-	while ( ( c = getopt_long ( argc, argv, "h", longopts, NULL ) ) >= 0 ){
-		switch ( c ) {
-		case 'h':
-			/* Display help text */
-		default:
-			/* Unrecognised/invalid option */
-			sanboot_syntax ( argv );
-			return 1;
-		}
-	}
+	if ( ( rc = parse_options ( argc, argv, &sanboot_cmd, &opts ) ) != 0 )
+		return rc;
 
-	/* Need exactly one image name remaining after the options */
-	if ( optind != ( argc - 1 ) ) {
-		sanboot_syntax ( argv );
-		return 1;
-	}
+	/* Parse root path */
 	root_path = argv[optind];
 
 	/* Boot from root path */
 	if ( ( rc = boot_root_path ( root_path ) ) != 0 ) {
 		printf ( "Could not boot from %s: %s\n",
 			 root_path, strerror ( rc ) );
-		return 1;
+		return rc;
 	}
 
 	return 0;
 }
 
+/** SAN commands */
 struct command sanboot_command __command = {
 	.name = "sanboot",
 	.exec = sanboot_exec,