diff --git a/debian/changelog b/debian/changelog
index 42d7d710..52a2113d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+llvm-toolchain-7 (1:7-7) unstable; urgency=medium
+
+  [ Samuel Thibault ]
+  * Apply hurd fixes (Closes: #908847).
+   - hurd-lib_Support_Unix_Path.inc.diff
+   - hurd-pathmax.diff
+   - hurd-tools_llvm-shlib_CMakeLists.txt.diff
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 18 Oct 2018 16:50:58 +0200
+
 llvm-toolchain-7 (1:7-6) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/patches/hurd-lib_Support_Unix_Path.inc.diff b/debian/patches/hurd-lib_Support_Unix_Path.inc.diff
index 2aabaf3d..372d535c 100644
--- a/debian/patches/hurd-lib_Support_Unix_Path.inc.diff
+++ b/debian/patches/hurd-lib_Support_Unix_Path.inc.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-6.0-6.0.1/lib/Support/Unix/Path.inc
+Index: llvm-toolchain-7-7/lib/Support/Unix/Path.inc
 ===================================================================
---- llvm-toolchain-6.0-6.0.1.orig/lib/Support/Unix/Path.inc
-+++ llvm-toolchain-6.0-6.0.1/lib/Support/Unix/Path.inc
-@@ -98,7 +98,7 @@
+--- llvm-toolchain-7-7.orig/lib/Support/Unix/Path.inc
++++ llvm-toolchain-7-7/lib/Support/Unix/Path.inc
+@@ -83,7 +83,7 @@
  #define STATVFS_F_FRSIZE(vfs) static_cast<uint64_t>(vfs.f_bsize)
  #endif
  
@@ -11,8 +11,8 @@ Index: llvm-toolchain-6.0-6.0.1/lib/Support/Unix/Path.inc
  #define STATVFS_F_FLAG(vfs) (vfs).f_flag
  #else
  #define STATVFS_F_FLAG(vfs) (vfs).f_flags
-@@ -111,7 +111,7 @@ namespace sys  {
- namespace fs {
+@@ -99,7 +99,7 @@ const file_t kInvalidFile = -1;
+ 
  #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) ||     \
      defined(__minix) || defined(__FreeBSD_kernel__) || defined(__linux__) ||   \
 -    defined(__CYGWIN__) || defined(__DragonFly__) || defined(_AIX)
@@ -20,16 +20,7 @@ Index: llvm-toolchain-6.0-6.0.1/lib/Support/Unix/Path.inc
  static int
  test_dir(char ret[PATH_MAX], const char *dir, const char *bin)
  {
-@@ -187,7 +187,7 @@ std::string getMainExecutable(const char
- 
-   if (getprogpath(exe_path, argv0) != NULL)
-     return exe_path;
--#elif defined(__linux__) || defined(__CYGWIN__)
-+#elif defined(__linux__) || defined(__CYGWIN__) || defined(__GNU__)
-   char exe_path[MAXPATHLEN];
-   StringRef aPath("/proc/self/exe");
-   if (sys::fs::exists(aPath)) {
-@@ -360,7 +360,7 @@ std::error_code remove(const Twine &path
+@@ -348,7 +348,7 @@ std::error_code remove(const Twine &path
  }
  
  static bool is_local_impl(struct STATVFS &Vfs) {
@@ -38,7 +29,7 @@ Index: llvm-toolchain-6.0-6.0.1/lib/Support/Unix/Path.inc
  #ifndef NFS_SUPER_MAGIC
  #define NFS_SUPER_MAGIC 0x6969
  #endif
-@@ -370,7 +370,11 @@ static bool is_local_impl(struct STATVFS
+@@ -358,7 +358,11 @@ static bool is_local_impl(struct STATVFS
  #ifndef CIFS_MAGIC_NUMBER
  #define CIFS_MAGIC_NUMBER 0xFF534D42
  #endif
diff --git a/debian/patches/hurd-tools_llvm-shlib_CMakeLists.txt.diff b/debian/patches/hurd-tools_llvm-shlib_CMakeLists.txt.diff
index 987e2db4..89d34fc3 100644
--- a/debian/patches/hurd-tools_llvm-shlib_CMakeLists.txt.diff
+++ b/debian/patches/hurd-tools_llvm-shlib_CMakeLists.txt.diff
@@ -1,12 +1,12 @@
-Index: llvm-toolchain-6.0-6.0.1/tools/llvm-shlib/CMakeLists.txt
+Index: llvm-toolchain-7-7/tools/llvm-shlib/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-6.0-6.0.1.orig/tools/llvm-shlib/CMakeLists.txt
-+++ llvm-toolchain-6.0-6.0.1/tools/llvm-shlib/CMakeLists.txt
+--- llvm-toolchain-7-7.orig/tools/llvm-shlib/CMakeLists.txt
++++ llvm-toolchain-7-7/tools/llvm-shlib/CMakeLists.txt
 @@ -40,6 +40,7 @@ set_property(TARGET LLVM PROPERTY VERSIO
  list(REMOVE_DUPLICATES LIB_NAMES)
  if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU)
     OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
 +   OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "GNU")
+    OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD")
+    OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "Fuchsia")
     OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "DragonFly")
-    OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "SunOS")) # FIXME: It should be "GNU ld for elf"
-   configure_file(