diff --git a/debian/changelog b/debian/changelog
index 713f17af..9d7ad07e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,12 +7,19 @@ llvm-toolchain-3.3 (1:3.3-9) UNRELEASED; urgency=low
   [ Sylvestre Ledru ]
   * Only use -fuse-ld=gold on supported distribution. Simplify the
     backports.
+  * Add more fixes for the HURD port...
 
   [ Jon Severinsson ]
   * Merge from llvm-toolchain-3.2 branch up to 3.2repack-11.
   * Drop auto-generated file debian/libllvm3.3.install.
-  * Automatically determine GCC_VERSION and dep:devlibs based on g++ package version.
-  * Automatically determine if -fuse-ld=gold is supported based on binutils package version.
+  * Automatically determine GCC_VERSION and dep:devlibs based on g++ package
+    version.
+  * Automatically determine if -fuse-ld=gold is supported based on binutils
+    package version.
+
+  [ Adam Conrad ]
+  * debian/patches/lldb-link-atomic.diff: Link lldb with -latomic to get
+    builtin GCC atomic helpers on arches (like powerpc) that need them.
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 26 Aug 2013 14:48:42 +0200
 
diff --git a/debian/patches/hurd-pathmax.diff b/debian/patches/hurd-pathmax.diff
index 227d7759..0abe1eed 100644
--- a/debian/patches/hurd-pathmax.diff
+++ b/debian/patches/hurd-pathmax.diff
@@ -1,7 +1,7 @@
 Index: llvm-toolchain-3.3-3.3/clang/lib/Basic/FileManager.cpp
 ===================================================================
---- llvm-toolchain-3.3-3.3.orig/clang/lib/Basic/FileManager.cpp	2013-01-26 17:29:36.000000000 +0100
-+++ llvm-toolchain-3.3-3.3/clang/lib/Basic/FileManager.cpp	2013-08-23 09:53:21.538337851 +0200
+--- llvm-toolchain-3.3-3.3.orig/clang/lib/Basic/FileManager.cpp	2013-01-26 16:29:36.000000000 +0000
++++ llvm-toolchain-3.3-3.3/clang/lib/Basic/FileManager.cpp	2013-08-28 10:29:30.000000000 +0000
 @@ -43,6 +43,11 @@
  #if defined(LLVM_ON_UNIX)
  #include <limits.h>
@@ -14,3 +14,19 @@ Index: llvm-toolchain-3.3-3.3/clang/lib/Basic/FileManager.cpp
  using namespace clang;
  
  // FIXME: Enhance libsystem to support inode and other fields.
+Index: llvm-toolchain-3.3-3.3/lldb/include/lldb/lldb-defines.h
+===================================================================
+--- llvm-toolchain-3.3-3.3.orig/lldb/include/lldb/lldb-defines.h	2013-08-28 14:14:04.000000000 +0000
++++ llvm-toolchain-3.3-3.3/lldb/include/lldb/lldb-defines.h	2013-08-28 14:15:01.000000000 +0000
+@@ -12,6 +12,11 @@
+ 
+ #include "lldb/lldb-types.h"
+ 
++// For GNU Hurd
++#if defined(__GNU__) && !defined(PATH_MAX)
++# define PATH_MAX 4096
++#endif
++
+ #if !defined(UINT32_MAX)
+     #define UINT32_MAX 4294967295U
+ #endif
diff --git a/debian/patches/lldb-hurd.diff b/debian/patches/lldb-hurd.diff
new file mode 100644
index 00000000..e5d2d262
--- /dev/null
+++ b/debian/patches/lldb-hurd.diff
@@ -0,0 +1,28 @@
+Index: llvm-toolchain-3.3-3.3/lldb/include/lldb/Host/Config.h
+===================================================================
+--- llvm-toolchain-3.3-3.3.orig/lldb/include/lldb/Host/Config.h	2013-08-28 10:29:30.000000000 +0000
++++ llvm-toolchain-3.3-3.3/lldb/include/lldb/Host/Config.h	2013-08-28 17:23:00.000000000 +0000
+@@ -14,7 +14,7 @@
+ 
+ #include "lldb/Host/macosx/Config.h"
+ 
+-#elif defined(__linux__)
++#elif defined(__linux__) || defined(__GNU__)
+ 
+ #include "lldb/Host/linux/Config.h"
+ 
+Index: llvm-toolchain-3.3-3.3/lldb/source/Host/common/Host.cpp
+===================================================================
+--- llvm-toolchain-3.3-3.3.orig/lldb/source/Host/common/Host.cpp	2013-08-28 10:29:30.000000000 +0000
++++ llvm-toolchain-3.3-3.3/lldb/source/Host/common/Host.cpp	2013-08-28 17:25:38.000000000 +0000
+@@ -16,8 +16,10 @@
+ #include <limits.h>
+ #include <netdb.h>
+ #include <pwd.h>
++#ifndef __GNU__
+ #include <sys/sysctl.h>
+ #include <sys/types.h>
++#endif
+ #include <unistd.h>
+ 
+ #if defined (__APPLE__)
diff --git a/debian/patches/lldb-link-atomic.diff b/debian/patches/lldb-link-atomic.diff
new file mode 100644
index 00000000..3bfe368b
--- /dev/null
+++ b/debian/patches/lldb-link-atomic.diff
@@ -0,0 +1,16 @@
+Description: Link lldb with -latomic to get GCC atomic helpers
+Author: Adam Conrad <adconrad@ubuntu.com>
+Forwarded: no
+Last-Update: 2013-08-21
+
+--- llvm-toolchain-3.3-3.3.orig/lldb/lib/Makefile
++++ llvm-toolchain-3.3-3.3/lldb/lib/Makefile
+@@ -140,6 +140,8 @@ ifeq ($(HOST_OS), $(filter $(HOST_OS), L
+     LLVMLibsOptions += -Wl,--no-undefined
+     # Link in python
+     LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt
++    # Link GCC atomic helper library
++    LLVMLibsOptions += -latomic
+     LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT)
+ endif
+ 
diff --git a/debian/patches/series b/debian/patches/series
index bcb8ef7d..0bd98168 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -32,3 +32,5 @@ disable-execinfo-usage.diff
 unwind-chain-inclusion.diff
 hurd-pathmax.diff
 libprofile_rt_sparc.patch
+lldb-hurd.diff
+lldb-link-atomic.diff