diff --git a/defaults/yacy.init b/defaults/yacy.init
index 25f667f45..0e1c9aba9 100644
--- a/defaults/yacy.init
+++ b/defaults/yacy.init
@@ -474,6 +474,7 @@ browserPopUpApplication=firefox
 
 # defines if the YaCy icon appears in the system tray on supported platforms
 trayIcon=true
+tray.label=YaCy
 
 # index sharing attributes: by default, sharing is on.
 # If you want to use YaCy only for local indexing (robinson mode),
diff --git a/source/de/anomic/yacy/yacyTray.java b/source/de/anomic/yacy/yacyTray.java
index 6edc888e8..26602bcb4 100644
--- a/source/de/anomic/yacy/yacyTray.java
+++ b/source/de/anomic/yacy/yacyTray.java
@@ -49,12 +49,15 @@ public final class yacyTray {
 	private static boolean isShown = false;
 	final private static boolean deutsch = System.getProperty("user.language","").equals("de");
 	
+	public static String trayLabel;
+	
 	public static boolean lockBrowserPopup = true;
 	
 	
 	public static void init(final plasmaSwitchboard par_sb) {
 		sb = par_sb;
 		isIntegrated = sb.getConfigBool("browserintegration", false);
+		trayLabel = sb.getConfig("tray.label", "YaCy");
 		try {
 			final boolean trayIcon = sb.getConfigBool("trayIcon", false);
 			if (trayIcon && serverSystem.isWindows) {
@@ -202,7 +205,7 @@ class nativeTrayIcon {
 
 			Object arglist1[] = new Object[3];
 			arglist1[0] = i;
-			arglist1[1] = "YaCy";
+			arglist1[1] = yacyTray.trayLabel;
 			arglist1[2] = menu;
 			this.TrayIcon = TrayIconConstructor.newInstance(arglist1);