diff --git a/NEWS b/NEWS
index fe5e02f02a6..ea99ae16d0d 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ PHP                                                                        NEWS
   . Fixed potential race condition during resource ID allocation. (ryancaicse)
   . Fixed bug GH-8133 (Preloading of constants containing arrays with enums
     segfaults). (ilutov)
+  . Fixed Haiku ZTS builds. (David Carlier)
 
 - Date:
   . Fixed bug GH-7752 (DateTimeZone::getTransitions() returns insufficient
diff --git a/TSRM/TSRM.c b/TSRM/TSRM.c
index aa1c210ceec..7cd924318ed 100644
--- a/TSRM/TSRM.c
+++ b/TSRM/TSRM.c
@@ -736,13 +736,15 @@ TSRM_API size_t tsrm_get_ls_cache_tcb_offset(void)
 #if defined(__APPLE__) && defined(__x86_64__)
     // TODO: Implement support for fast JIT ZTS code ???
 	return 0;
-#elif defined(__x86_64__) && defined(__GNUC__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__MUSL__)
+#elif defined(__x86_64__) && defined(__GNUC__) && !defined(__FreeBSD__) && \
+	!defined(__OpenBSD__) && !defined(__MUSL__) && !defined(__HAIKU__)
 	size_t ret;
 
 	asm ("movq _tsrm_ls_cache@gottpoff(%%rip),%0"
           : "=r" (ret));
 	return ret;
-#elif defined(__i386__) && defined(__GNUC__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__MUSL__)
+#elif defined(__i386__) && defined(__GNUC__) && !defined(__FreeBSD__) && \
+	!defined(__OpenBSD__) && !defined(__MUSL__) && !defined(__HAIKU__)
 	size_t ret;
 
 	asm ("leal _tsrm_ls_cache@ntpoff,%0"