diff --git a/infrastructure/db/config.no-stdthreads b/infrastructure/db/config.no-stdthreads
new file mode 100644
index 00000000000..2fdb1afe983
--- /dev/null
+++ b/infrastructure/db/config.no-stdthreads
@@ -0,0 +1,3 @@
+# $OpenBSD: config.no-stdthreads,v 1.1 2024/09/15 18:15:17 jca Exp $
+# included unless devel/libstdthreads
+ac_cv_header_threads_h=${ac_cv_header_threads_h=no}
diff --git a/infrastructure/mk/gnu.port.mk b/infrastructure/mk/gnu.port.mk
index 55cb3b70246..93e4ae46876 100644
--- a/infrastructure/mk/gnu.port.mk
+++ b/infrastructure/mk/gnu.port.mk
@@ -1,6 +1,6 @@
 #-*- mode: Fundamental; tab-width: 4; -*-
 # ex:ts=4 sw=4 filetype=make:
-# $OpenBSD: gnu.port.mk,v 1.61 2019/05/14 14:59:56 naddy Exp $
+# $OpenBSD: gnu.port.mk,v 1.62 2024/09/15 18:15:17 jca Exp $
 #	Based on bsd.port.mk, originally by Jordan K. Hubbard.
 #	This file is in the public domain.
 
@@ -43,7 +43,8 @@ CONFIG_SITE_LIST += config.site
 	textproc/gsed gsed \
 	archivers/gtar* gtar \
 	lang/gawk gawk \
-	sysutils/coreutils coreutils
+	sysutils/coreutils coreutils \
+	devel/libstdthreads stdthreads
 .  if !defined(BUILD_DEPENDS) || !${BUILD_DEPENDS:M$d}
 CONFIG_SITE_LIST += config.no-${name}
 .  endif
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 431bf97e27e..7da6250cc3f 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -2,7 +2,7 @@ COMMENT =      Scientific Programming Language
 
 VERSION =	7.3.0
 DISTNAME =	octave-${VERSION}
-REVISION =	8
+REVISION =	9
 EXTRACT_SUFX =	.tar.xz
 CATEGORIES =	math
 
@@ -40,7 +40,6 @@ MODULES =	fortran \
 		x11/qt5
 
 BUILD_DEPENDS =	${MODFORTRAN_BUILD_DEPENDS} \
-		devel/libstdthreads \
 		math/gnuplot \
 		print/texinfo \
 		textproc/gsed
diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index 1fc4af49d43..f34b4bdb398 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -1,6 +1,6 @@
 COMMENT =	program for statistical analysis of sampled data
 DISTNAME =	pspp-1.4.1
-REVISION =	5
+REVISION =	6
 CATEGORIES =	math x11
 
 HOMEPAGE =	https://www.gnu.org/software/pspp/
@@ -30,7 +30,6 @@ MODULES =	lang/python
 MODPY_RUNDEP =	No
 
 BUILD_DEPENDS =	devel/gettext,-tools \
-		devel/libstdthreads \
 		print/texinfo
 
 LIB_DEPENDS =	databases/postgresql \