diff --git a/Mailnag/configuration/configwindow.py b/Mailnag/configuration/configwindow.py
index 341e900..e552d2b 100644
--- a/Mailnag/configuration/configwindow.py
+++ b/Mailnag/configuration/configwindow.py
@@ -173,9 +173,7 @@ class ConfigWindow:
 		"NoDisplay=false\n" + \
 		"X-GNOME-Autostart-enabled=true\n" + \
 		"Name=Mailnag\n" + \
-		"Comment=Email notifier for GNOME 3\n" \
-		"OnlyShowIn=GNOME;\n" \
-		"AutostartCondition=GNOME3 if-session gnome"
+		"Comment=An extendable mail notification daemon\n"
 
 		autostart_folder = os.path.join(bd.xdg_config_home, "autostart")
 		if not os.path.exists(autostart_folder):
diff --git a/data/mailnag.1 b/data/mailnag.1
index 3752580..e3400d9 100644
--- a/data/mailnag.1
+++ b/data/mailnag.1
@@ -1,12 +1,11 @@
 .TH MAILNAG "1" "November 2012" "Mailnag 0.5.0"
 .SH NAME
-mailnag \- a mail notification daemon for GNOME 3
+mailnag \- an extendable mail notification daemon
 .SH SYNOPSIS
 \fBmailnag\fP
 .SH DESCRIPTION
 \fBmailnag\fP checks POP3 and IMAP servers for new mail. When it finds new
-messages, it creates a GNOME 3 notification (integrated with the Shell) that
-mentions sender and subject.
+messages, it calls various plugins to handle them (e. g. for desktop notifications).
 .PP
 Note that you must first run \fBmailnag_config\fR to setup Mailnag.
 .SH SEE ALSO
diff --git a/data/mailnag_config.desktop b/data/mailnag_config.desktop
index a7dc0dc..f673a76 100644
--- a/data/mailnag_config.desktop
+++ b/data/mailnag_config.desktop
@@ -2,8 +2,8 @@
 [Desktop Entry]
 Name=Mailnag Configuration
 Name[de]=Mailnag Configuration
-Comment=A notifier for new emails
-Comment[de]=Ein Benachrichtiger für neue Emails
+Comment=An extendable mail notification daemon
+Comment[de]=Ein erweiterbarar Mail Benachrichtigungs-Dämon
 Keywords=mail;notify;notification;config;settings;preferences;
 Exec=/usr/bin/mailnag_config
 Icon=/usr/share/mailnag/mailnag.svg