diff --git a/.pick_status.json b/.pick_status.json
index 6ed95504169..b424d5c3bf1 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -913,7 +913,7 @@
         "description": "meson: don't build with USE_ELF_TLS on OpenBSD",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "a47c525f3281a2753180e076c7e9b7772aff8f06"
     },
diff --git a/meson.build b/meson.build
index 57fb03bd15c..ba77877f2ee 100644
--- a/meson.build
+++ b/meson.build
@@ -424,7 +424,7 @@ endif
 
 # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
 use_elf_tls = false
-if not ['windows', 'freebsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
+if not ['windows', 'freebsd', 'openbsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
   pre_args += '-DUSE_ELF_TLS'
   use_elf_tls = true
 endif