diff --git a/src/main.cpp b/src/main.cpp
index ed9800f00..0c5f73b23 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1582,6 +1582,7 @@ ClientLauncher::~ClientLauncher()
 		device->drop();
 }
 
+
 bool ClientLauncher::run(GameParams &game_params, const Settings &cmd_args)
 {
 	init_args(game_params, cmd_args);
@@ -1602,11 +1603,14 @@ bool ClientLauncher::run(GameParams &game_params, const Settings &cmd_args)
 		return true;
 	}
 
-	if (device->getVideoDriver() == NULL) {
+	video::IVideoDriver *video_driver = device->getVideoDriver();
+	if (video_driver == NULL) {
 		errorstream << "Could not initialize video driver." << std::endl;
 		return false;
 	}
 
+	porting::setXorgClassHint(video_driver->getExposedVideoData(), "Minetest");
+
 	/*
 		This changes the minimum allowed number of vertices in a VBO.
 		Default is 500.
diff --git a/src/porting.cpp b/src/porting.cpp
index 42ee2ffe2..e1a062ecd 100644
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -36,6 +36,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	#include <sys/utsname.h>
 #endif
 
+#if !defined(_WIN32) && !defined(__APPLE__) && \
+	!defined(__ANDROID__) && !defined(SERVER)
+	#define XORG_USED
+#endif
+
+#ifdef XORG_USED
+	#include <X11/Xlib.h>
+	#include <X11/Xutil.h>
+#endif
+
 #include "config.h"
 #include "debug.h"
 #include "filesys.h"
@@ -545,6 +555,20 @@ void initIrrlicht(irr::IrrlichtDevice * _device) {
 	device = _device;
 }
 
+void setXorgClassHint(const video::SExposedVideoData &video_data,
+	const std::string &name)
+{
+#ifdef XORG_USED
+	XClassHint *classhint = XAllocClassHint();
+	classhint->res_name  = (char *)name.c_str();
+	classhint->res_class = (char *)name.c_str();
+
+	XSetClassHint((Display *)video_data.OpenGLLinux.X11Display,
+		video_data.OpenGLLinux.X11Window, classhint);
+	XFree(classhint);
+#endif
+}
+
 #ifndef SERVER
 v2u32 getWindowSize() {
 	return device->getVideoDriver()->getScreenSize();
diff --git a/src/porting.h b/src/porting.h
index b6f71103d..a184af8b8 100644
--- a/src/porting.h
+++ b/src/porting.h
@@ -411,6 +411,9 @@ inline const char * getPlatformName()
 	;
 }
 
+void setXorgClassHint(const video::SExposedVideoData &video_data,
+	const std::string &name);
+
 } // namespace porting
 
 #ifdef __ANDROID__