Index: uspace/app/bdsh/cmds/modules/unalias/unalias.c
===================================================================
--- uspace/app/bdsh/cmds/modules/unalias/unalias.c	(revision 08bd04c0993927efd5ac827783788d10e8371cef)
+++ uspace/app/bdsh/cmds/modules/unalias/unalias.c	(revision 02c6dcc803242797ced1b0e27dca419801279b57)
@@ -9,4 +9,5 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <str.h>
 #include <adt/odict.h>
 
@@ -22,11 +23,24 @@
 static const char *cmdname = "unalias";
 
+
+
+static void free_alias(odlink_t *alias_link)
+{
+	alias_t *data = odict_get_instance(alias_link, alias_t, odict);
+	odict_remove(alias_link);
+
+	free(data->name);
+	free(data->value);
+	free(data);
+}
+
+
 /* Dispays help for unalias in various levels */
 void help_cmd_unalias(unsigned int level)
 {
-	printf("This is the %s help for '%s'.\n",
-		level ? EXT_HELP : SHORT_HELP, cmdname);
+	printf("`%s' removes an alias or all aliases with -a\n", cmdname);
 	return;
 }
+
 
 /* Main entry point for unalias, accepts an array of arguments */
@@ -34,20 +48,33 @@
 {
 
+	if(argv[1] == NULL) {
+		help_cmd_unalias(HELP_LONG);
+		return CMD_SUCCESS;
+	}
+
 	size_t i;
+	odlink_t *alias_link;
 
-	for(i = 1; argv[i] != NULL; i++) {
-		odlink_t *alias_link = odict_find_eq(&alias_dict, (void*)argv[i], NULL);
+	for (i = 1; argv[i] != NULL; i++) {
+		if (str_cmp(argv[i], "-a") == 0) {
+			alias_link = odict_first(&alias_dict);
+			while (alias_link != NULL) {
+				odlink_t *old_alias_link = alias_link;
+				alias_link = odict_next(old_alias_link, &alias_dict);
+				free_alias(old_alias_link);
+			}
 
-		if(alias_link == NULL) {
+			return CMD_SUCCESS;
+		}
+
+
+		alias_link = odict_find_eq(&alias_dict, (void*)argv[i], NULL);
+
+		if (alias_link == NULL) {
 			printf("%s: No alias '%s' found\n", cmdname, argv[i]);
 			return CMD_FAILURE;
 		}
 
-		alias_t *data = odict_get_instance(alias_link, alias_t, odict);
-		odict_remove(alias_link);
-
-		free(data->name);
-		free(data->value);
-		free(data);
+		free_alias(alias_link);
 	}