diff --git a/lang/Makefile b/lang/Makefile
index 4407f1627d3..ea14a5e6da7 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.200 2017/06/29 15:56:43 bcallah Exp $
+# $OpenBSD: Makefile,v 1.201 2017/07/06 21:25:38 espie Exp $
 
      SUBDIR =
      SUBDIR += STk
@@ -82,7 +82,7 @@
      SUBDIR += ruby
      SUBDIR += rust
      SUBDIR += sbcl
-     SUBDIR += sbcl,threads
+#     SUBDIR += sbcl,threads
      SUBDIR += scala
      SUBDIR += scheme-report
      SUBDIR += scheme48
diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile
index 5b4f97ed0be..964fa8c53f4 100644
--- a/lang/sbcl/Makefile
+++ b/lang/sbcl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2017/02/06 12:23:14 sthen Exp $
+# $OpenBSD: Makefile,v 1.34 2017/07/06 21:25:38 espie Exp $
 
 # not yet ported to other arches
 ONLY_FOR_ARCHS =	amd64 i386 powerpc
@@ -29,6 +29,9 @@ MODGCC4_LANGS=		c
 WANTLIB=		c m util
 
 PSEUDO_FLAVORS=		native_bootstrap
+
+# XXX threads flavor does not work reliably it won't even pass its self-test
+# on amd64 all the time
 FLAVORS=		threads
 FLAVOR?=