diff --git a/src/compositor.c b/src/compositor.c
index 67a750fc..96eb15b8 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -38,6 +38,7 @@
 #include <sys/mman.h>
 #include <sys/wait.h>
 #include <sys/socket.h>
+#include <sys/utsname.h>
 #include <unistd.h>
 #include <math.h>
 #include <linux/input.h>
@@ -2883,6 +2884,17 @@ compositor_bind(struct wl_client *client,
 			     &compositor_interface, id, compositor);
 }
 
+static void
+log_uname(void)
+{
+	struct utsname usys;
+
+	uname(&usys);
+
+	weston_log("OS: %s, %s, %s, %s\n", usys.sysname, usys.release,
+						usys.version, usys.machine);
+}
+
 static void
 log_extensions(const char *name, const char *extensions)
 {
@@ -2943,6 +2955,8 @@ weston_compositor_init(struct weston_compositor *ec,
 
 	wl_display_init_shm(display);
 
+	log_uname();
+
 	weston_log("egl vendor: %s\n",
 		   eglQueryString(ec->display, EGL_VENDOR));
 	log_extensions("egl extensions",