diff --git a/ChangeLog b/ChangeLog
index 1a360abc8..274da3c93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-05-12  Marco Pesenti Gritti  <marco@it.gnome.org>
+
+	* capplets/file-types/service-info.c: (service_info_save),
+	(service_info_delete):
+
+	Set the enabled key for new services and unset it on delete
+
 2003-05-07  Jody Goldberg <jody@gnome.org>
 
 	* configure.in : post release version bump
diff --git a/capplets/file-types/service-info.c b/capplets/file-types/service-info.c
index c9c5322a8..0319994d9 100644
--- a/capplets/file-types/service-info.c
+++ b/capplets/file-types/service-info.c
@@ -207,6 +207,7 @@ service_info_save (const ServiceInfo *info)
 	}
 
 	set_bool (info, "type", info->run_program);
+	set_bool (info, "enabled", TRUE);
 }
 
 void
@@ -214,6 +215,10 @@ service_info_delete (const ServiceInfo *info)
 {
 	gchar *tmp;
 
+	tmp = get_key_name (info, "enabled");
+	gconf_client_unset (gconf_client_get_default (), tmp, NULL);
+	g_free (tmp);
+
 	tmp = get_key_name (info, "type");
 	gconf_client_unset (gconf_client_get_default (), tmp, NULL);
 	g_free (tmp);