Index: uspace/app/bdsh/cmds/modules/mount/entry.h
===================================================================
--- uspace/app/bdsh/cmds/modules/mount/entry.h	(revision 537611ccf87670c95219a35a5a26b32e574fec29)
+++ uspace/app/bdsh/cmds/modules/mount/entry.h	(revision 537611ccf87670c95219a35a5a26b32e574fec29)
@@ -0,0 +1,9 @@
+#ifndef MOUNT_ENTRY_H
+#define MOUNT_ENTRY_H
+
+/* Entry points for the mount command */
+extern int cmd_mount(char **);
+extern void help_cmd_mount(unsigned int);
+
+#endif /* MOUNT_ENTRY_H */
+
Index: uspace/app/bdsh/cmds/modules/mount/mount.c
===================================================================
--- uspace/app/bdsh/cmds/modules/mount/mount.c	(revision 537611ccf87670c95219a35a5a26b32e574fec29)
+++ uspace/app/bdsh/cmds/modules/mount/mount.c	(revision 537611ccf87670c95219a35a5a26b32e574fec29)
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2009 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <vfs/vfs.h>
+#include <errno.h>
+#include "config.h"
+#include "util.h"
+#include "errors.h"
+#include "entry.h"
+#include "mount.h"
+#include "cmds.h"
+
+static const char *cmdname = "mount";
+
+/* Dispays help for mount in various levels */
+void help_cmd_mount(unsigned int level)
+{
+	static char helpfmt[] =
+	    "Usage:  %s <fstype> <mp> <dev> [<moptions>]\n";
+	if (level == HELP_SHORT) {
+		printf("'%s' mounts a file system.\n", cmdname);
+	} else {
+		help_cmd_mount(HELP_SHORT);
+		printf(helpfmt, cmdname);
+	}
+	return;
+}
+
+/* Main entry point for mount, accepts an array of arguments */
+int cmd_mount(char **argv)
+{
+	unsigned int argc;
+	char *mopts = "";
+	int rc;
+
+	argc = cli_count_args(argv);
+
+	if ((argc < 4) || (argc > 5)) {
+		printf("%s: invalid number of arguments.\n",
+		    cmdname);
+		return CMD_FAILURE;
+	}
+	if (argc == 5)
+		mopts = argv[4];
+
+	rc = mount(argv[1], argv[2], argv[3], mopts, 0);
+	if (rc != EOK) {
+		printf("Unable to mount %s filesystem to %s on %s (rc=%d)\n",
+		    argv[1], argv[2], argv[3], rc);
+		return CMD_FAILURE;
+	}
+
+	return CMD_SUCCESS;
+}
+
Index: uspace/app/bdsh/cmds/modules/mount/mount.h
===================================================================
--- uspace/app/bdsh/cmds/modules/mount/mount.h	(revision 537611ccf87670c95219a35a5a26b32e574fec29)
+++ uspace/app/bdsh/cmds/modules/mount/mount.h	(revision 537611ccf87670c95219a35a5a26b32e574fec29)
@@ -0,0 +1,8 @@
+#ifndef MOUNT_H
+#define MOUNT_H
+
+/* Prototypes for the mount command, excluding entry points */
+
+
+#endif /* MOUNT_H */
+
Index: uspace/app/bdsh/cmds/modules/mount/mount_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/mount/mount_def.h	(revision 537611ccf87670c95219a35a5a26b32e574fec29)
+++ uspace/app/bdsh/cmds/modules/mount/mount_def.h	(revision 537611ccf87670c95219a35a5a26b32e574fec29)
@@ -0,0 +1,7 @@
+{
+	"mount",
+	"The mount command",
+	&cmd_mount,
+	&help_cmd_mount,
+},
+