diff --git a/libvo/video_out.c b/libvo/video_out.c
index 8c2f551e4c..2333afcb80 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -560,7 +560,7 @@ const char *vo_get_window_title(struct vo *vo)
     if (vo->opts->vo_wintitle) {
         return vo->opts->vo_wintitle;
     } else {
-        return "MPlayer";
+        return "mplayer2";
     }
 }
 
diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index 2c7572e8b1..cdbbc213b5 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -715,7 +715,7 @@ void vo_x11_classhint(struct vo *vo, Window window, const char *name)
     pid_t pid = getpid();
 
     wmClass.res_name = opts->vo_winname ? opts->vo_winname : (char *)name;
-    wmClass.res_class = "MPlayer";
+    wmClass.res_class = "mplayer2";
     XSetClassHint(x11->display, window, &wmClass);
     XChangeProperty(x11->display, window, x11->XA_NET_WM_PID, XA_CARDINAL,
                     32, PropModeReplace, (unsigned char *) &pid, 1);