diff --git a/debian/changelog b/debian/changelog
index 62fe6c94..7b90268c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-llvm-toolchain-snapshot (1:7~svn327768-2) UNRELEASED; urgency=medium
+llvm-toolchain-snapshot (1:7~svn330801-1~exp2) experimental; urgency=medium
+
+  * d/p/impl-path-hurd.diff: Try to fix an issue with hurd
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 26 Apr 2018 15:45:59 +0200
+
+llvm-toolchain-snapshot (1:7~svn330801-1~exp1) experimental; urgency=medium
 
   * Remove sysconf_interceptor_bypass_test.cc because it makes
     Debian unstable and Ubuntu bionic freeze
@@ -27,7 +33,10 @@ llvm-toolchain-snapshot (1:7~svn327768-2) UNRELEASED; urgency=medium
   [ David Tenty ]
   * Migrate to automatic debug packages (Closes: #893267)
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 17 Mar 2018 16:53:15 +0100
+  [ Sylvestre Ledru ]
+  * New snapshot release
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 25 Apr 2018 10:59:20 +0200
 
 llvm-toolchain-snapshot (1:7~svn327768-1) unstable; urgency=medium
 
diff --git a/debian/patches/impl-path-hurd.diff b/debian/patches/impl-path-hurd.diff
new file mode 100644
index 00000000..db41d996
--- /dev/null
+++ b/debian/patches/impl-path-hurd.diff
@@ -0,0 +1,13 @@
+Index: llvm-toolchain-snapshot-7~svn330801/lib/Support/Unix/Path.inc
+===================================================================
+--- llvm-toolchain-snapshot-7~svn330801.orig/lib/Support/Unix/Path.inc
++++ llvm-toolchain-snapshot-7~svn330801/lib/Support/Unix/Path.inc
+@@ -172,7 +172,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)) {
diff --git a/debian/patches/series b/debian/patches/series
index 2a5b0520..02ec3ffd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -49,4 +49,4 @@ test-keep-alive.diff
 remove-test-freezing.diff
 0048-Set-html_static_path-_static-everywhere.patch
 0049-Use-Debian-provided-MathJax-everywhere.patch
-
+impl-path-hurd.diff