diff --git a/debian/changelog b/debian/changelog
index 2d5e646a..9fc2ab19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
-llvm-toolchain-4.0 (1:4.0.1~+rc1-3) UNRELEASED; urgency=medium
+llvm-toolchain-4.0 (1:4.0.1~+rc2-2) UNRELEASED; urgency=medium
 
+  * Try to fix polly on hurd (missing PATH_MAX)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 03 Jun 2017 17:49:48 +0200
+
+llvm-toolchain-4.0 (1:4.0.1~+rc2-1) unstable; urgency=medium
+
+  * New snapshot release
   * Remove clang-tblgen from clang-X.Y (done by upstream)
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 24 May 2017 09:13:54 +0200
+ -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 01 Jun 2017 23:01:38 +0200
 
 llvm-toolchain-4.0 (1:4.0.1~+rc1-2) unstable; urgency=medium
 
diff --git a/debian/patches/hurd-pathmax.diff b/debian/patches/hurd-pathmax.diff
index 8ec6b901..229c9d52 100644
--- a/debian/patches/hurd-pathmax.diff
+++ b/debian/patches/hurd-pathmax.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_4.0~svn280802/clang/lib/Basic/FileManager.cpp
+Index: llvm-toolchain-4.0-4.0.1~+rc2/clang/lib/Basic/FileManager.cpp
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn280802.orig/clang/lib/Basic/FileManager.cpp
-+++ llvm-toolchain-snapshot_4.0~svn280802/clang/lib/Basic/FileManager.cpp
+--- llvm-toolchain-4.0-4.0.1~+rc2.orig/clang/lib/Basic/FileManager.cpp
++++ llvm-toolchain-4.0-4.0.1~+rc2/clang/lib/Basic/FileManager.cpp
 @@ -500,6 +500,12 @@ void FileManager::invalidateCache(const
    UniqueRealFiles.erase(Entry->getUniqueID());
  }
@@ -15,10 +15,10 @@ Index: llvm-toolchain-snapshot_4.0~svn280802/clang/lib/Basic/FileManager.cpp
  void FileManager::GetUniqueIDMapping(
                     SmallVectorImpl<const FileEntry *> &UIDToFiles) const {
    UIDToFiles.clear();
-Index: llvm-toolchain-snapshot_4.0~svn280802/lldb/include/lldb/lldb-defines.h
+Index: llvm-toolchain-4.0-4.0.1~+rc2/lldb/include/lldb/lldb-defines.h
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn280802.orig/lldb/include/lldb/lldb-defines.h
-+++ llvm-toolchain-snapshot_4.0~svn280802/lldb/include/lldb/lldb-defines.h
+--- llvm-toolchain-4.0-4.0.1~+rc2.orig/lldb/include/lldb/lldb-defines.h
++++ llvm-toolchain-4.0-4.0.1~+rc2/lldb/include/lldb/lldb-defines.h
 @@ -28,6 +28,11 @@
  #define INT32_MAX 2147483647
  #endif
@@ -31,10 +31,10 @@ Index: llvm-toolchain-snapshot_4.0~svn280802/lldb/include/lldb/lldb-defines.h
  #if !defined(UINT32_MAX)
  #define UINT32_MAX 4294967295U
  #endif
-Index: llvm-toolchain-snapshot_4.0~svn280802/lib/Support/Unix/Path.inc
+Index: llvm-toolchain-4.0-4.0.1~+rc2/lib/Support/Unix/Path.inc
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn280802.orig/lib/Support/Unix/Path.inc
-+++ llvm-toolchain-snapshot_4.0~svn280802/lib/Support/Unix/Path.inc
+--- llvm-toolchain-4.0-4.0.1~+rc2.orig/lib/Support/Unix/Path.inc
++++ llvm-toolchain-4.0-4.0.1~+rc2/lib/Support/Unix/Path.inc
 @@ -62,6 +62,7 @@
  // For GNU Hurd
  #if defined(__GNU__) && !defined(PATH_MAX)
@@ -43,11 +43,11 @@ Index: llvm-toolchain-snapshot_4.0~svn280802/lib/Support/Unix/Path.inc
  #endif
  
  #include <sys/types.h>
-Index: llvm-toolchain-snapshot_4.0~svn280802/tools/dsymutil/DwarfLinker.cpp
+Index: llvm-toolchain-4.0-4.0.1~+rc2/tools/dsymutil/DwarfLinker.cpp
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn280802.orig/tools/dsymutil/DwarfLinker.cpp
-+++ llvm-toolchain-snapshot_4.0~svn280802/tools/dsymutil/DwarfLinker.cpp
-@@ -41,6 +41,11 @@
+--- llvm-toolchain-4.0-4.0.1~+rc2.orig/tools/dsymutil/DwarfLinker.cpp
++++ llvm-toolchain-4.0-4.0.1~+rc2/tools/dsymutil/DwarfLinker.cpp
+@@ -42,6 +42,11 @@
  #include <string>
  #include <tuple>
  
@@ -59,3 +59,19 @@ Index: llvm-toolchain-snapshot_4.0~svn280802/tools/dsymutil/DwarfLinker.cpp
  namespace llvm {
  namespace dsymutil {
  
+Index: llvm-toolchain-4.0-4.0.1~+rc2/polly/lib/External/ppcg/cuda_common.c
+===================================================================
+--- llvm-toolchain-4.0-4.0.1~+rc2.orig/polly/lib/External/ppcg/cuda_common.c
++++ llvm-toolchain-4.0-4.0.1~+rc2/polly/lib/External/ppcg/cuda_common.c
+@@ -15,6 +15,11 @@
+ #include "cuda_common.h"
+ #include "ppcg.h"
+ 
++// For GNU Hurd
++#if defined(__GNU__) && !defined(PATH_MAX)
++# define PATH_MAX 4096
++#endif
++
+ /* Open the host .cu file and the kernel .hu and .cu files for writing.
+  * Add the necessary includes.
+  */