--- abook-0.6.0~pre2.orig/abook.c
+++ abook-0.6.0~pre2/abook.c
@@ -474,7 +474,7 @@
 		db_enumerate_items(e)
 			muttq_print_item(stdout, e.item);
 	} else {
-		int search_fields[] = {NAME, EMAIL, NICK, -1};
+		int search_fields[] = {NAME, EMAIL, NICK, TAGS, -1};
 		int i;
 		if( (i = find_item(str, 0, search_fields)) < 0 ) {
 			printf("Not found\n");
--- abook-0.6.0~pre2.orig/database.c
+++ abook-0.6.0~pre2/database.c
@@ -58,6 +58,7 @@
 	{"url",		N_("URL"),		FIELD_STRING}, /* URL */
 	{"notes",	N_("Notes"),		FIELD_STRING}, /* NOTES */
 	{"anniversary",	N_("Anniversary day"),	FIELD_DATE},   /* ANNIVERSARY */
+    {"tags",    N_("Tags"),     FIELD_LIST}, /* TAGS */
 	{0} /* ITEM_FIELDS */
 };
 
--- abook-0.6.0~pre2.orig/ui.c
+++ abook-0.6.0~pre2/ui.c
@@ -557,7 +557,7 @@
 {
 	int item = -1;
 	static char findstr[MAX_FIELD_LEN];
-	int search_fields[] = {NAME, EMAIL, NICK, -1};
+	int search_fields[] = {NAME, EMAIL, NICK, TAGS, -1};
 
 	clear_statusline();
 
--- abook-0.6.0~pre2.orig/database.h
+++ abook-0.6.0~pre2/database.h
@@ -23,6 +23,7 @@
 	URL,
 	NOTES,
 	ANNIVERSARY,
+    TAGS,
 	ITEM_FIELDS /* this is the last */
 };