diff --git a/debian/changelog b/debian/changelog
index c8497384..90afcb6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 llvm-toolchain-3.3 (1:3.3-6) unstable; urgency=low
 
-  * Fix the FTBFS under hurd
+  * Fix the FTBFS under hurd and KFreeBSD
   * Do not remove all *.o in tests. Some of them are from upstream source
     tarball. Thanks to Maarten Lankhorst for the fix.
 
diff --git a/debian/patches/disable-execinfo-usage.diff b/debian/patches/disable-execinfo-usage.diff
new file mode 100644
index 00000000..452dd840
--- /dev/null
+++ b/debian/patches/disable-execinfo-usage.diff
@@ -0,0 +1,12 @@
+Index: llvm-toolchain-3.3-3.3/lldb/lib/Makefile
+===================================================================
+--- llvm-toolchain-3.3-3.3.orig/lldb/lib/Makefile	2013-08-19 08:27:21.000000000 +0000
++++ llvm-toolchain-3.3-3.3/lldb/lib/Makefile	2013-08-20 14:49:43.000000000 +0000
+@@ -150,5 +150,6 @@
+     # Allow unresolved symbols.
+     LLVMLibsOptions += -Wl,--allow-shlib-undefined
+     # Link in python
+-    LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -L/usr/local/lib -lexecinfo
++    LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt
++# -L/usr/local/lib -lexecinfo
+ endif
diff --git a/debian/patches/kfreebsd-lldb.diff b/debian/patches/kfreebsd-lldb.diff
new file mode 100644
index 00000000..28816126
--- /dev/null
+++ b/debian/patches/kfreebsd-lldb.diff
@@ -0,0 +1,30 @@
+--- llvm-toolchain-3.3-3.3.orig/lldb/source/Host/common/Host.cpp	2013-08-20 17:27:18.000000000 +0200
++++ llvm-toolchain-3.3-3.3/lldb/source/Host/common/Host.cpp	2013-08-20 17:27:43.000000000 +0200
+@@ -524,7 +524,8 @@
+ {
+ }
+ 
+-#if !defined (__APPLE__) && !defined (__FreeBSD__) && !defined (__linux__) // see macosx/Host.mm
++#if !defined (__APPLE__) && !defined (__FreeBSD__) && !defined (__linux__)  && !defined(__FreeBSD_kernel__) // see macosx/Host.mm
++
+ 
+ void
+ Host::ThreadCreated (const char *thread_name)
+@@ -1180,7 +1181,7 @@
+     return NULL;
+ }
+ 
+-#if !defined (__APPLE__) && !defined (__FreeBSD__) // see macosx/Host.mm
++#if !defined (__APPLE__) && !defined (__FreeBSD__) && !defined(__FreeBSD_kernel__) // see macosx/Host.mm
+ bool
+ Host::GetOSBuildString (std::string &s)
+ {
+@@ -1229,7 +1230,7 @@
+ }
+ #endif // #if !defined (__APPLE__) && !defined(__linux__)
+ 
+-#if !defined (__APPLE__) && !defined (__FreeBSD__) && !defined(__linux__)
++#if !defined (__APPLE__) && !defined (__FreeBSD__) && !defined(__linux__)&& !defined(__FreeBSD_kernel__)
+ bool
+ Host::GetProcessInfo (lldb::pid_t pid, ProcessInstanceInfo &process_info)
+ {
diff --git a/debian/patches/series b/debian/patches/series
index 47072be6..63b1f5bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,4 +27,5 @@ lldb33-to-r183444.patch
 use-deb-json.diff
 mipsel-ftbfs.diff
 patch-bug-16511.diff
-hurd.diff
+kfreebsd-lldb.diff
+disable-execinfo-usage.diff