diff --git a/src/system.h b/src/system.h
index 83a6455..a3f230b 100644
--- a/src/system.h
+++ b/src/system.h
@@ -164,6 +164,10 @@
 #define OPSYS "Haiku"
 #endif
 
+#if defined(__GNU__)
+#define OPSYS "Hurd"
+#endif
+
 /* Detect CPUs */
 #if defined(__alpha__) || defined(__alpha)
 #define CPUINFO "Alpha"
@@ -209,6 +213,10 @@
 #define CPUINFO "SuperH"
 #endif
 
+#if defined(__s390__) || defined(__s390x__)
+#define CPUINFO "s390"
+#endif
+
 /* Misc */
 #ifdef MSG_NOSIGNAL
 #define UHUB_SEND_SIGNAL MSG_NOSIGNAL