diff --git a/configure.ac b/configure.ac
index 7cd56a97..9afae793 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,7 +105,6 @@ case "${host}" in
 	;;
 	*)
 		WM_OSDEP="stub"
-		CFLAGS="-DSTUB_HINT=\\\"${host}\\\""
 	;;
 esac
 AC_SUBST(WM_OSDEP)
diff --git a/src/osdep_stub.c b/src/osdep_stub.c
index 187ca928..79fe9c16 100644
--- a/src/osdep_stub.c
+++ b/src/osdep_stub.c
@@ -1,24 +1,29 @@
 
+#include <sys/utsname.h>
+
 #include <WINGs/WUtil.h>
 
 #include "wconfig.h"
 
-#ifndef STUB_HINT
-#define STUB_HINT	"(unknown)"
-#endif
-
 Bool GetCommandForPid(int pid, char ***argv, int *argc)
 {
-	*argv = NULL;
-	*argc = 0;
 	static int notified = 0;
 
 	if (!notified) {
-		wwarning(_("%s is not implemented on this platform; "
-		    "tell wmaker-dev@lists.windowmaker.info you are running \"%s\""),
-		    __FUNCTION__, STUB_HINT);
-		notified = 1;
+		struct utsname un;
+
+		if (uname(&un) != -1) {
+			wwarning(_("%s is not implemented on this platform; "
+				"tell wmaker-dev@windowmaker.org you are running "
+				"%s release %s version %s"), __FUNCTION__,
+				un.sysname, un.release, un.version);
+			notified = 1;
+		}
+
 	}
 
+	*argv = NULL;
+	*argc = 0;
+
 	return False;
 }