Index: uspace/app/bdsh/cmds/builtins/builtins.h
===================================================================
--- uspace/app/bdsh/cmds/builtins/builtins.h	(revision d752cf4b1be184990dc8cf50aba3798a8f14cfae)
+++ uspace/app/bdsh/cmds/builtins/builtins.h	(revision b7be2306e00c5daf940f0576c52cc60bcff8feba)
@@ -5,7 +5,9 @@
 
 #include "cd/entry.h"
+#include "exit/entry.h"
 
 builtin_t builtins[] = {
 #include "cd/cd_def.h"
+#include "exit/exit_def.h"
 	{NULL, NULL, NULL, NULL}
 };
Index: uspace/app/bdsh/cmds/builtins/exit/entry.h
===================================================================
--- uspace/app/bdsh/cmds/builtins/exit/entry.h	(revision b7be2306e00c5daf940f0576c52cc60bcff8feba)
+++ uspace/app/bdsh/cmds/builtins/exit/entry.h	(revision b7be2306e00c5daf940f0576c52cc60bcff8feba)
@@ -0,0 +1,12 @@
+#ifndef EXIT_ENTRY_H_
+#define EXIT_ENTRY_H_
+
+#include "scli.h"
+
+/* Entry points for the quit command */
+extern void help_cmd_exit(unsigned int);
+extern int cmd_exit(char *[], cliuser_t *);
+
+#endif
+
+
Index: uspace/app/bdsh/cmds/builtins/exit/exit.c
===================================================================
--- uspace/app/bdsh/cmds/builtins/exit/exit.c	(revision b7be2306e00c5daf940f0576c52cc60bcff8feba)
+++ uspace/app/bdsh/cmds/builtins/exit/exit.c	(revision b7be2306e00c5daf940f0576c52cc60bcff8feba)
@@ -0,0 +1,55 @@
+/* Copyright (c) 2008, Tim Post <tinkertim@gmail.com>
+ * 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.
+ *
+ * Neither the name of the original program's authors nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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 "entry.h"
+#include "exit.h"
+#include "cmds.h"
+
+static const char *cmdname = "exit";
+
+extern volatile unsigned int cli_quit;
+extern const char *progname;
+
+void help_cmd_exit(unsigned int level)
+{
+	printf("Type `%s' to exit %s\n", cmdname, progname);
+	return;
+}
+
+/* Quits the program and returns the status of whatever command
+ * came before invoking 'quit' */
+int cmd_exit(char *argv[], cliuser_t *usr)
+{
+	/* Inform that we're outta here */
+	cli_quit = 1;
+	return CMD_SUCCESS;
+}
Index: uspace/app/bdsh/cmds/builtins/exit/exit.h
===================================================================
--- uspace/app/bdsh/cmds/builtins/exit/exit.h	(revision b7be2306e00c5daf940f0576c52cc60bcff8feba)
+++ uspace/app/bdsh/cmds/builtins/exit/exit.h	(revision b7be2306e00c5daf940f0576c52cc60bcff8feba)
@@ -0,0 +1,6 @@
+#ifndef EXIT_H
+#define EXIT_H
+
+/* Prototypes for the quit command (excluding entry points) */
+
+#endif
Index: uspace/app/bdsh/cmds/builtins/exit/exit_def.h
===================================================================
--- uspace/app/bdsh/cmds/builtins/exit/exit_def.h	(revision b7be2306e00c5daf940f0576c52cc60bcff8feba)
+++ uspace/app/bdsh/cmds/builtins/exit/exit_def.h	(revision b7be2306e00c5daf940f0576c52cc60bcff8feba)
@@ -0,0 +1,6 @@
+{
+	"exit",
+	"Exit the shell",
+	&cmd_exit,
+	&help_cmd_exit,
+},