--- ./xpcom/threads/nsThreadManager.cpp.orig	2011-08-25 02:37:45.000000000 +0200
+++ ./xpcom/threads/nsThreadManager.cpp	2011-08-28 17:14:14.000000000 +0200
@@ -12,6 +12,10 @@
 #include "nsAutoPtr.h"
 #include "nsCycleCollectorUtils.h"
 
+#if defined(__FreeBSD__)
+#include <osreldate.h>
+#endif
+
 using namespace mozilla;
 
 #ifdef XP_WIN
@@ -89,6 +89,11 @@
 nsresult
 nsThreadManager::Init()
 {
+#if defined(NS_TLS) && (__FreeBSD_version < 802513 \
+  || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045))
+  if (!gTLSThreadID)
+    gTLSThreadID = mozilla::threads::Generic;
+#endif
   if (!mThreadsByPRThread.Init())
     return NS_ERROR_OUT_OF_MEMORY;