diff --git a/debian/patches/lldb33-to-r183444.patch b/debian/patches/lldb33-to-r183444.patch
index ee08a0a9..1d9485cc 100644
--- a/debian/patches/lldb33-to-r183444.patch
+++ b/debian/patches/lldb33-to-r183444.patch
@@ -1,78 +1,59 @@
-Index: lldb/scripts/CMakeLists.txt
+Index: llvm-toolchain-3.3-3.3/.arcconfig
===================================================================
---- lldb/scripts/CMakeLists.txt (revision 183906)
-+++ lldb/scripts/CMakeLists.txt (working copy)
-@@ -13,3 +13,8 @@
- ADD_CUSTOM_TARGET(swig_wrapper ALL echo -n
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/LLDBWrapPython.cpp
- )
+--- llvm-toolchain-3.3-3.3.orig/.arcconfig 2013-06-13 18:33:34.000000000 +0200
++++ llvm-toolchain-3.3-3.3/.arcconfig 2013-06-13 18:33:34.000000000 +0200
+@@ -1,4 +1,8 @@
+ {
++ "project_id" : "lldb",
++ "conduit_uri" : "http://llvm-reviews.chandlerc.com/"
++}
++{
+ "project_id" : "llvm",
+ "conduit_uri" : "http://llvm-reviews.chandlerc.com/"
+ }
+Index: llvm-toolchain-3.3-3.3/lldb/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-3.3-3.3.orig/lldb/CMakeLists.txt 2013-06-13 18:33:34.000000000 +0200
++++ llvm-toolchain-3.3-3.3/lldb/CMakeLists.txt 2013-06-13 18:33:34.000000000 +0200
+@@ -147,6 +147,11 @@
+ "`CMakeFiles'. Please delete them.")
+ endif()
+
++# Compute the LLDB version from the LLVM version.
++string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" LLDB_VERSION
++ ${PACKAGE_VERSION})
++message(STATUS "LLDB version: ${LLDB_VERSION}")
+
-+# Install the LLDB python module on all operating systems (except Windows)
-+if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
-+ install(SCRIPT lldb_python_module.cmake -DCMAKE_INSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\" -DCMAKE_BUILD_DIR=\"${CMAKE_BUILD_DIR}\")
+ macro(add_lldb_library name)
+ llvm_process_sources(srcs ${ARGN})
+ if (MSVC_IDE OR XCODE)
+@@ -170,7 +175,7 @@
+ #endif()
+
+ if(LLDB_USED_LIBS)
+- if (CMAKE_SYSTEM_NAME MATCHES "Linux")
++ if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+ target_link_libraries(${name} -Wl,--start-group ${LLDB_USED_LIBS} -Wl,--end-group)
+ else()
+ target_link_libraries(${name} ${LLDB_USED_LIBS})
+@@ -241,7 +246,13 @@
+ ${DEBUG_SYMBOLS_LIBRARY})
+ endif()
+
++# On FreeBSD, link libexecinfo because libc is missing backtrace()
++if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
++ list(APPEND system_libs execinfo)
+endif()
-Index: lldb/scripts/Python/python-wrapper.swig
++
+ #add_subdirectory(include)
++add_subdirectory(docs)
+ add_subdirectory(scripts)
+ add_subdirectory(source)
+ add_subdirectory(test)
+Index: llvm-toolchain-3.3-3.3/lldb/docs/CMakeLists.txt
===================================================================
---- lldb/scripts/Python/python-wrapper.swig (revision 183906)
-+++ lldb/scripts/Python/python-wrapper.swig (working copy)
-@@ -318,8 +318,18 @@
- pvalue = PyObject_CallObject (pfunc, pargs);
- Py_DECREF (pargs);
-
-- if (pvalue != NULL && pvalue != Py_None && PyString_Check(pvalue))
-- retval.assign(PyString_AsString(pvalue));
-+ if (pvalue != NULL && pvalue != Py_None)
-+ {
-+ if (PyString_Check(pvalue))
-+ retval.assign(PyString_AsString(pvalue));
-+ else
-+ {
-+ PyObject* value_as_string = PyObject_Str(pvalue);
-+ if (value_as_string && value_as_string != Py_None && PyString_Check(value_as_string))
-+ retval.assign(PyString_AsString(value_as_string));
-+ Py_XDECREF(value_as_string);
-+ }
-+ }
- Py_XDECREF (pvalue);
- Py_INCREF (session_dict);
- }
-Index: lldb/scripts/Python/finish-swig-Python-LLDB.sh
-===================================================================
---- lldb/scripts/Python/finish-swig-Python-LLDB.sh (revision 183906)
-+++ lldb/scripts/Python/finish-swig-Python-LLDB.sh (working copy)
-@@ -248,7 +248,8 @@
- create_python_package "/macosx" "${package_files}"
-
- # lldb/diagnose
-- package_files="${SRC_ROOT}/examples/python/diagnose_unwind.py"
-+ package_files="${SRC_ROOT}/examples/python/diagnose_unwind.py
-+ ${SRC_ROOT}/examples/python/diagnose_nsstring.py"
- create_python_package "/diagnose" "${package_files}"
-
- # Copy files needed by lldb/macosx/heap.py to build libheap.dylib
-Index: lldb/scripts/lldb_python_module.cmake
-===================================================================
---- lldb/scripts/lldb_python_module.cmake (revision 0)
-+++ lldb/scripts/lldb_python_module.cmake (revision 0)
-@@ -0,0 +1,14 @@
-+# This CMake script installs the LLDB python module from the build directory
-+# to the install directory.
-+
-+# FIXME: if a non-standard version of python is requested, the cmake macro
-+# below will need Python_ADDITIONAL_VERSIONS set in order to find it.
-+include(FindPythonInterp)
-+
-+SET(PYTHON_DIRECTORY python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
-+
-+SET(lldb_module_src ${CMAKE_CURRENT_BINARY_DIR}/lib/${PYTHON_DIRECTORY})
-+SET(lldb_module_dest ${CMAKE_INSTALL_PREFIX}/lib)
-+
-+MESSAGE(STATUS "Installing LLDB python module from: ${lldb_module_src} to ${lldb_module_dest}")
-+FILE(COPY "${lldb_module_src}" DESTINATION "${lldb_module_dest}")
-Index: lldb/docs/CMakeLists.txt
-===================================================================
---- lldb/docs/CMakeLists.txt (revision 0)
-+++ lldb/docs/CMakeLists.txt (revision 0)
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ llvm-toolchain-3.3-3.3/lldb/docs/CMakeLists.txt 2013-06-13 18:33:34.000000000 +0200
@@ -0,0 +1,41 @@
+
+include(FindDoxygen)
@@ -115,10 +96,10 @@ Index: lldb/docs/CMakeLists.txt
+ COMMENT "Generating LLDB Python API reference with epidoc" VERBATIM
+ )
+endif(EPYDOC_EXECUTABLE)
-Index: lldb/docs/doxygen.cfg.in
+Index: llvm-toolchain-3.3-3.3/lldb/docs/doxygen.cfg.in
===================================================================
---- lldb/docs/doxygen.cfg.in (revision 0)
-+++ lldb/docs/doxygen.cfg.in (revision 0)
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ llvm-toolchain-3.3-3.3/lldb/docs/doxygen.cfg.in 2013-06-13 18:33:34.000000000 +0200
@@ -0,0 +1,1633 @@
+# Doxyfile 1.7.1
+
@@ -1753,10 +1734,28 @@ Index: lldb/docs/doxygen.cfg.in
+# the various graphs.
+
+DOT_CLEANUP = YES
-Index: lldb/docs/doxygen.header
+Index: llvm-toolchain-3.3-3.3/lldb/docs/doxygen.footer
===================================================================
---- lldb/docs/doxygen.header (revision 0)
-+++ lldb/docs/doxygen.header (revision 0)
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ llvm-toolchain-3.3-3.3/lldb/docs/doxygen.footer 2013-06-13 18:33:34.000000000 +0200
+@@ -0,0 +1,13 @@
++
++
++
++
++
++
++
++
$doxygenversion