diff --git a/src/libm/dispatcher.h b/src/libm/dispatcher.h
index fa4c83a2..1c8a0c95 100644
--- a/src/libm/dispatcher.h
+++ b/src/libm/dispatcher.h
@@ -19,16 +19,46 @@ static sigjmp_buf sigjmp;
 #define LONGJMP siglongjmp
 #endif
 
+// Protect sigjmp from parallel access
+// FIXME: Static initializers will not work on Windows and MacOS
+#ifdef __linux__
+static pthread_mutex_t mtx = PTHREAD_MUTEX_INITIALIZER;
+#else
+#error "pthread initializer not supported"
+#endif
+
 static void sighandler(int signum) {
   LONGJMP(sigjmp, 1);
 }
 
+// On Linux we prefer the more robust sigaction over signal
+#ifdef __linux__
+#define SIGNAL(SIGNUM, SIGHANDLER, ORIG)			\
+  {								\
+    struct sigaction sigact = { .sa_handler = (SIGHANDLER) };	\
+    sigaction((SIGNUM), &sigact, (ORIG));			\
+  }
+#define RESTORE_SIGNAL(SIGNUM, ORIG)				\
+  sigaction((SIGNUM), (ORIG), NULL);
+#else
+#define SIGNAL(SIGNUM, SIGHANDLER, ORIG)	\
+  (ORIG) = signal((SIGNUM), (SIGHANDLER));
+#define RESTORE_SIGNAL(SIGNUM, ORIG)		\
+  signal((SIGNUM), (ORIG));
+#endif
+
 static int cpuSupportsExt(void (*tryExt)()) {
+  // FIXME: Strictly speaking this should be an atomic_int
+  // But int should be atomic on all supported targets anyway?!
   static int cache = -1;
+
+  // This is not atomic. However, since the only transition is from -1
+  // to either 0 or 1 and never back, this should be ok.
   if (cache != -1) return cache;
+  pthread_mutex_lock(&mtx);
 
-  void (*org);
-  org = signal(SIGILL, sighandler);
+  void *org = NULL;
+  SIGNAL(SIGILL, sighandler, org);
 
   if (SETJMP(sigjmp) == 0) {
     (*tryExt)();
@@ -37,7 +67,9 @@ static int cpuSupportsExt(void (*tryExt)()) {
     cache = 0;
   }
 
-  signal(SIGILL, org);
+  RESTORE_SIGNAL(SIGILL, org);
+
+  pthread_mutex_unlock(&mtx);
   return cache;
 }
 
diff --git a/src/libm/dispavx.c.org b/src/libm/dispavx.c.org
index b50ff0a9..afafaf22 100644
--- a/src/libm/dispavx.c.org
+++ b/src/libm/dispavx.c.org
@@ -7,6 +7,7 @@
 #include <assert.h>
 #include <signal.h>
 #include <setjmp.h>
+#include <pthread.h>
 
 #include "misc.h"
 
diff --git a/src/libm/disppower_128.c.org b/src/libm/disppower_128.c.org
index dcb65393..c15086a3 100644
--- a/src/libm/disppower_128.c.org
+++ b/src/libm/disppower_128.c.org
@@ -7,6 +7,7 @@
 #include <assert.h>
 #include <signal.h>
 #include <setjmp.h>
+#include <pthread.h>
 
 #include "misc.h"
 
diff --git a/src/libm/disps390x_128.c.org b/src/libm/disps390x_128.c.org
index 1c92af2e..bda82928 100644
--- a/src/libm/disps390x_128.c.org
+++ b/src/libm/disps390x_128.c.org
@@ -7,6 +7,7 @@
 #include <assert.h>
 #include <signal.h>
 #include <setjmp.h>
+#include <pthread.h>
 
 #include "misc.h"
 
diff --git a/src/libm/dispscalar.c.org b/src/libm/dispscalar.c.org
index ccf28c21..31a38498 100644
--- a/src/libm/dispscalar.c.org
+++ b/src/libm/dispscalar.c.org
@@ -7,6 +7,7 @@
 #include <assert.h>
 #include <signal.h>
 #include <setjmp.h>
+#include <pthread.h>
 
 #include "misc.h"
 
diff --git a/src/libm/dispsse.c.org b/src/libm/dispsse.c.org
index a6ca65a8..a4558dad 100644
--- a/src/libm/dispsse.c.org
+++ b/src/libm/dispsse.c.org
@@ -7,6 +7,7 @@
 #include <assert.h>
 #include <signal.h>
 #include <setjmp.h>
+#include <pthread.h>
 
 #include "misc.h"