diff --git a/ChangeLog b/ChangeLog
index b30b9d55f57b6023caf49fc8b90efacc1126506e..a67d26f9d8c8a8b5d33a1a34c8dcad860ef59d33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-23  Rodney Dawes  <dobey.pwns@gmail.com>
+
+	* libnautilus-private/nautilus-emblem-utils.c:
+	(is_reserved_keyword, nautilus_emblem_should_show_in_list):
+	* libnautilus-private/nautilus-file.h:
+	Add the emblem-shared icon to be hidden in the emblems dialog and
+	to be used as a reserved keyword as well
+
 2008-06-23  Cosimo Cecchi  <cosimoc@gnome.org>
 
 	* configure.in: require libbeagle >= 0.2.4. (#351288).
diff --git a/libnautilus-private/nautilus-emblem-utils.c b/libnautilus-private/nautilus-emblem-utils.c
index a1863339b3352bf26c9b5a3ab6c7706930499755..d30934c4e032fd94e82af4e92c8de2cf2993fb42 100644
--- a/libnautilus-private/nautilus-emblem-utils.c
+++ b/libnautilus-private/nautilus-emblem-utils.c
@@ -43,6 +43,7 @@
 #define EMBLEM_NAME_NOREAD  "emblem-noread"
 #define EMBLEM_NAME_NOWRITE "emblem-nowrite"
 #define EMBLEM_NAME_NOTE    "emblem-note"
+#define EMBLEM_NAME_SHARED  "emblem-shared"
 
 GList *
 nautilus_emblem_list_available (void)
@@ -97,6 +98,9 @@ is_reserved_keyword (const char *keyword)
 	if (g_ascii_strcasecmp (keyword, NAUTILUS_FILE_EMBLEM_NAME_NOTE) == 0) {
 		return TRUE;
 	}
+	if (g_ascii_strcasecmp (keyword, NAUTILUS_FILE_EMBLEM_NAME_SHARED) == 0) {
+		return TRUE;
+	}
 
 	available = nautilus_emblem_list_available ();
 	icon_name = nautilus_emblem_get_icon_name_from_keyword (keyword);
@@ -127,6 +131,9 @@ nautilus_emblem_should_show_in_list (const char *emblem)
 	if (strcmp (emblem, EMBLEM_NAME_NOTE) == 0) {
 		return FALSE;
 	}
+	if (strcmp (emblem, EMBLEM_NAME_SHARED) == 0) {
+		return FALSE;
+	}
 
 	return TRUE;
 }
diff --git a/libnautilus-private/nautilus-file.h b/libnautilus-private/nautilus-file.h
index fdd117db4742f453bf737beffa8fa57e125f7625..1e8f487cf32f7e2e6621fe39b3a4eaa1d7167162 100644
--- a/libnautilus-private/nautilus-file.h
+++ b/libnautilus-private/nautilus-file.h
@@ -87,6 +87,7 @@ typedef enum {
 #define NAUTILUS_FILE_EMBLEM_NAME_TRASH "trash"
 #define NAUTILUS_FILE_EMBLEM_NAME_NOTE "note"
 #define NAUTILUS_FILE_EMBLEM_NAME_DESKTOP "desktop"
+#define NAUTILUS_FILE_EMBLEM_NAME_SHARED "shared"
 
 typedef void (*NautilusFileCallback)          (NautilusFile  *file,
 				               gpointer       callback_data);