diff --git a/Makefile.local b/Makefile.local
index a3a19dea..1744747a 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -13,6 +13,7 @@ notmuch_client_srcs =		\
 	notmuch-reply.c		\
 	notmuch-restore.c	\
 	notmuch-search.c	\
+	notmuch-search-tags.c   \
 	notmuch-setup.c		\
 	notmuch-show.c		\
 	notmuch-tag.c		\
diff --git a/notmuch-client.h b/notmuch-client.h
index c04eaeb4..2888a6c8 100644
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -119,6 +119,9 @@ notmuch_show_command (void *ctx, int argc, char *argv[]);
 int
 notmuch_tag_command (void *ctx, int argc, char *argv[]);
 
+int
+notmuch_search_tags_command (void *ctx, int argc, char *argv[]);
+
 const char *
 notmuch_time_relative_date (const void *ctx, time_t then);
 
diff --git a/notmuch-search-tags.c b/notmuch-search-tags.c
new file mode 100644
index 00000000..12011650
--- /dev/null
+++ b/notmuch-search-tags.c
@@ -0,0 +1,71 @@
+/* notmuch - Not much of an email program, (just index and search)
+ *
+ * Copyright © 2009 Carl Worth
+ * Copyright © 2009 Jan Janak
+ *
+ * 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 3 of the License, or
+ * (at your option) 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, see http://www.gnu.org/licenses/ .
+ *
+ * Author: Jan Janak <jan@ryngle.com>
+ */
+
+#include "notmuch-client.h"
+
+static int
+list_all_tags (notmuch_database_t* db)
+{
+    notmuch_tags_t* tags;
+    const char* t;
+
+    if ((tags = notmuch_database_get_all_tags (db)) == NULL) {
+	fprintf (stderr, "Error while obtaining tags from the database.\n");
+	return 1;
+    }
+
+    while((t = notmuch_tags_get (tags))) {
+	printf ("%s\n", t);
+	notmuch_tags_advance (tags);
+    }
+
+    notmuch_tags_destroy (tags);
+    return 0;
+}
+
+int
+notmuch_search_tags_command (void *ctx, int argc, char *argv[])
+{
+    notmuch_config_t *config;
+    notmuch_database_t *db;
+
+    config = NULL;
+    db = NULL;
+
+    if ((config = notmuch_config_open (ctx, NULL, NULL)) == NULL) {
+	goto error;
+    }
+
+    db = notmuch_database_open (notmuch_config_get_database_path (config),
+				NOTMUCH_DATABASE_MODE_READ_ONLY);
+    if (db == NULL) {
+	goto error;
+    }
+
+    if (list_all_tags (db) != 0) goto error;
+
+    notmuch_database_close (db);
+    return 0;
+
+error:
+    if (db) notmuch_database_close (db);
+    return 1;
+}
diff --git a/notmuch.c b/notmuch.c
index f45b6924..c57bb5c5 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -254,6 +254,12 @@ command_t commands[] = {
       "\t\tSo if you've previously been using sup for mail, then the\n"
       "\t\t\"notmuch restore\" command provides you a way to import\n"
       "\t\tall of your tags (or labels as sup calls them)." },
+    { "search-tags", notmuch_search_tags_command,
+      NULL,
+      "List all tags found in the database.",
+      "\t\tThis command returns an alphabetically sorted list of all tags\n"
+      "\t\tthat are present in the database. In other words, the resulting\n"
+      "\t\tlist is a collection of all tags from all messages." },
     { "help", notmuch_help_command,
       "[<command>]",
       "\t\tThis message, or more detailed help for the named command.",