diff --git a/ChangeLog b/ChangeLog
index 46ef8caaaadef20db490a54d2a46d09b0fc3d1d8..0c18840b851d3d3e9fc4af2bd1ca60054f69cef5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 
+2009-03-10 10:11 Ali aliov@xfce.org 
+	 * : Added Only show in XFCE in the autostart file and correct tooltip of a primary battery
+
 2009-03-09 23:09 Ali aliov@xfce.org 
 	 * : Changes in the battery tooltips/notifications
 
diff --git a/src/xfpm-battery.c b/src/xfpm-battery.c
index f609a07b46545166924a500e403325ad16df4c32..2803868e2796aa3603482affd0807370eb9e879b 100644
--- a/src/xfpm-battery.c
+++ b/src/xfpm-battery.c
@@ -383,8 +383,9 @@ xfpm_battery_refresh_tooltip_primary (XfpmBattery *battery, gboolean is_present,
     }
     else
     {
-	 tip = g_strdup_printf ("%i%% %s \n%s", 
+	 tip = g_strdup_printf ("%i%% %s %s\n%s", 
 			   percentage, 
+			   _("Battery"),
 			   str, 
 			   battery->priv->adapter_present ? 
 			   _("System is running on AC power") :
diff --git a/src/xfpm-main.c b/src/xfpm-main.c
index 5c610f1976b41d09465c09053280e8182991985a..3d5dc2462d3a58be8a6a93460a271016784b65a6 100644
--- a/src/xfpm-main.c
+++ b/src/xfpm-main.c
@@ -94,6 +94,7 @@ autostart()
     g_key_file_set_boolean(key,"Desktop Entry","StartupNotify",FALSE); 
     g_key_file_set_boolean(key,"Desktop Entry","Terminal",FALSE); 
     g_key_file_set_boolean(key,"Desktop Entry","Hidden",FALSE); 
+    g_key_file_set_string (key, "Desktop Entry", "OnlyShowIn", "XFCE");
     
     gchar *content = g_key_file_to_data(key,NULL,&error);