diff --git a/DEPS b/DEPS
index b2fd709b..9348a112 100644
--- a/DEPS
+++ b/DEPS
@@ -245,7 +245,8 @@
         }
     ],
     "patches": [
-        "patch/basepatch.patch"
+        "patch/basepatch.patch",
+        "patch/freebsd.patch"
     ],
     "custom_files": [
         {"from": "custom/net_util.h", "to": "net/base/net_util.h"},
diff --git a/patch/freebsd.patch b/patch/freebsd.patch
new file mode 100644
index 00000000..b78dbb29
--- /dev/null
+++ b/patch/freebsd.patch
@@ -0,0 +1,24 @@
+diff --git a/src/base/threading/platform_thread_freebsd.cc b/src/base/threading/platform_thread_freebsd.cc
+index bce1ccf..0b35e5d 100644
+--- a/src/base/threading/platform_thread_freebsd.cc
++++ b/src/base/threading/platform_thread_freebsd.cc
+@@ -12,7 +12,9 @@
+ #include "base/logging.h"
+ #include "base/threading/platform_thread_internal_posix.h"
+ #include "base/threading/thread_id_name_manager.h"
++#if 0
+ #include "base/tracked_objects.h"
++#endif
+ #include "build/build_config.h"
+ 
+ #if !defined(OS_NACL)
+@@ -67,7 +69,9 @@ bool GetCurrentThreadPriorityForPlatform(ThreadPriority* priority) {
+ // static
+ void PlatformThread::SetName(const std::string& name) {
+   ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name);
++#if 0
+   tracked_objects::ThreadData::InitializeThreadContext(name);
++#endif
+ 
+ #if !defined(OS_NACL)
+   // On FreeBSD we can get the thread names to show up in the debugger by
diff --git a/src/base/threading/platform_thread_freebsd.cc b/src/base/threading/platform_thread_freebsd.cc
index bce1ccf4..0b35e5d2 100644
--- a/src/base/threading/platform_thread_freebsd.cc
+++ b/src/base/threading/platform_thread_freebsd.cc
@@ -12,7 +12,9 @@
 #include "base/logging.h"
 #include "base/threading/platform_thread_internal_posix.h"
 #include "base/threading/thread_id_name_manager.h"
+#if 0
 #include "base/tracked_objects.h"
+#endif
 #include "build/build_config.h"
 
 #if !defined(OS_NACL)
@@ -67,7 +69,9 @@ bool GetCurrentThreadPriorityForPlatform(ThreadPriority* priority) {
 // static
 void PlatformThread::SetName(const std::string& name) {
   ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name);
+#if 0
   tracked_objects::ThreadData::InitializeThreadContext(name);
+#endif
 
 #if !defined(OS_NACL)
   // On FreeBSD we can get the thread names to show up in the debugger by