diff --git a/ChangeLog b/ChangeLog
index 742a00edc9..81f7d922e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-11  Jesse Pavel		<jpavel@helixcode.com>
+
+	* data/evolution.keys: Added support for the text/calendar and
+	text/x-calendar MIME types.
+
 2000-10-10  Gediminas Paulauskas  <menesis@delfi.lt>
 
 	* configure.in: Added lt to ALL_LINGUAS.
diff --git a/data/evolution.keys b/data/evolution.keys
index 91d5372ac0..7f28de5c8a 100644
--- a/data/evolution.keys
+++ b/data/evolution.keys
@@ -5,3 +5,20 @@ text/x-vcard
 	short_list_component_iids_for_novice_user_level=OAFIID:control:e_minicard:f9542709-fb31-4c6a-bc00-d462ba41e4b9
 	short_list_component_iids_for_intermediate_user_level=OAFIID:control:e_minicard:f9542709-fb31-4c6a-bc00-d462ba41e4b9
 	short_list_component_iids_for_hacker_user_level=OAFIID:control:e_minicard:f9542709-fb31-4c6a-bc00-d462ba41e4b9
+
+text/x-calendar
+	description=calendar information
+	default_action_type=component
+	default_component_iid=OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad
+	short_list_component_iids_for_novice_user_level=OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad
+	short_list_component_iids_for_intermediate_user_level=OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad
+	short_list_component_iids_for_hacker_user_level=OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad
+
+text/calendar
+	description=calendar information
+	default_action_type=component
+	default_component_iid=OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad
+	short_list_component_iids_for_novice_user_level=OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad
+	short_list_component_iids_for_intermediate_user_level=OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad
+	short_list_component_iids_for_hacker_user_level=OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad
+