Index: uspace/app/bdsh/Makefile
===================================================================
--- uspace/app/bdsh/Makefile	(revision e5773c67f253269d60114a343a65721cef2ac0f7)
+++ uspace/app/bdsh/Makefile	(revision 21f32ee1dcb810787a2a4e2ce4f2f3d11dd849cc)
@@ -48,4 +48,5 @@
 	cmds/modules/mv/mv.c \
 	cmds/modules/mount/mount.c \
+	cmds/modules/unmount/unmount.c \
 	cmds/modules/kcon/kcon.c \
 	cmds/builtins/exit/exit.c \
Index: uspace/app/bdsh/cmds/modules/module_aliases.h
===================================================================
--- uspace/app/bdsh/cmds/modules/module_aliases.h	(revision e5773c67f253269d60114a343a65721cef2ac0f7)
+++ uspace/app/bdsh/cmds/modules/module_aliases.h	(revision 21f32ee1dcb810787a2a4e2ce4f2f3d11dd849cc)
@@ -14,4 +14,5 @@
 char *mod_aliases[] = {
 	"ren", "mv",
+	"umount", "unmount",
 	NULL, NULL
 };
Index: uspace/app/bdsh/cmds/modules/modules.h
===================================================================
--- uspace/app/bdsh/cmds/modules/modules.h	(revision e5773c67f253269d60114a343a65721cef2ac0f7)
+++ uspace/app/bdsh/cmds/modules/modules.h	(revision 21f32ee1dcb810787a2a4e2ce4f2f3d11dd849cc)
@@ -31,4 +31,5 @@
 #include "mv/entry.h"
 #include "mount/entry.h"
+#include "unmount/entry.h"
 #include "kcon/entry.h"
 
@@ -51,4 +52,5 @@
 #include "mv/mv_def.h"
 #include "mount/mount_def.h"
+#include "unmount/unmount_def.h"
 #include "kcon/kcon_def.h"
 
Index: uspace/app/bdsh/cmds/modules/unmount/entry.h
===================================================================
--- uspace/app/bdsh/cmds/modules/unmount/entry.h	(revision 21f32ee1dcb810787a2a4e2ce4f2f3d11dd849cc)
+++ uspace/app/bdsh/cmds/modules/unmount/entry.h	(revision 21f32ee1dcb810787a2a4e2ce4f2f3d11dd849cc)
@@ -0,0 +1,9 @@
+#ifndef UNMOUNT_ENTRY_H
+#define UNMOUNT_ENTRY_H
+
+/* Entry points for the unmount command */
+extern int cmd_unmount(char **);
+extern void help_cmd_unmount(unsigned int);
+
+#endif /* UNMOUNT_ENTRY_H */
+
Index: uspace/app/bdsh/cmds/modules/unmount/unmount.c
===================================================================
--- uspace/app/bdsh/cmds/modules/unmount/unmount.c	(revision 21f32ee1dcb810787a2a4e2ce4f2f3d11dd849cc)
+++ uspace/app/bdsh/cmds/modules/unmount/unmount.c	(revision 21f32ee1dcb810787a2a4e2ce4f2f3d11dd849cc)
@@ -0,0 +1,51 @@
+/* Automatically generated by mknewcmd on Fri Jan 22 17:47:44 CET 2010
+ * This is machine generated output. The author of mknewcmd claims no
+ * copyright over the contents of this file. Where legally permitted, the
+ * contents herein are donated to the public domain.
+ *
+ * You should apply any license and copyright that you wish to this file,
+ * replacing this header in its entirety. */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "config.h"
+#include "util.h"
+#include "errors.h"
+#include "entry.h"
+#include "unmount.h"
+#include "cmds.h"
+
+static const char *cmdname = "unmount";
+
+/* Dispays help for unmount in various levels */
+void help_cmd_unmount(unsigned int level)
+{
+	printf("This is the %s help for '%s'.\n",
+		level ? EXT_HELP : SHORT_HELP, cmdname);
+	return;
+}
+
+/* Main entry point for unmount, accepts an array of arguments */
+int cmd_unmount(char **argv)
+{
+	unsigned int argc;
+	unsigned int i;
+
+	/* Count the arguments */
+	for (argc = 0; argv[argc] != NULL; argc ++);
+
+	printf("%s %s\n", TEST_ANNOUNCE, cmdname);
+	printf("%d arguments passed to %s", argc - 1, cmdname);
+
+	if (argc < 2) {
+		printf("\n");
+		return CMD_SUCCESS;
+	}
+
+	printf(":\n");
+	for (i = 1; i < argc; i++)
+		printf("[%d] -> %s\n", i, argv[i]);
+
+	return CMD_SUCCESS;
+}
+
Index: uspace/app/bdsh/cmds/modules/unmount/unmount.h
===================================================================
--- uspace/app/bdsh/cmds/modules/unmount/unmount.h	(revision 21f32ee1dcb810787a2a4e2ce4f2f3d11dd849cc)
+++ uspace/app/bdsh/cmds/modules/unmount/unmount.h	(revision 21f32ee1dcb810787a2a4e2ce4f2f3d11dd849cc)
@@ -0,0 +1,8 @@
+#ifndef UNMOUNT_H
+#define UNMOUNT_H
+
+/* Prototypes for the unmount command, excluding entry points */
+
+
+#endif /* UNMOUNT_H */
+
Index: uspace/app/bdsh/cmds/modules/unmount/unmount_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/unmount/unmount_def.h	(revision 21f32ee1dcb810787a2a4e2ce4f2f3d11dd849cc)
+++ uspace/app/bdsh/cmds/modules/unmount/unmount_def.h	(revision 21f32ee1dcb810787a2a4e2ce4f2f3d11dd849cc)
@@ -0,0 +1,14 @@
+{
+	"unmount",
+	"The unmount command",
+	&cmd_unmount,
+	&help_cmd_unmount,
+},
+
+{
+	"umount",
+	NULL,
+	&cmd_unmount,
+	&help_cmd_unmount,
+},
+