diff --git a/debian/changelog b/debian/changelog
index c8e96860..fd4a6e5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+llvm-toolchain-snapshot (1:11~++20200701093119+ffee8040534-1~exp2) UNRELEASED; urgency=medium
+
+  * debian/patches/hurd/hurd-EIEIO-undef.diff: Remove, upstreamed.
+  * debian/patches/hurd/hurd-cxx-paths.diff: Remove, upstreamed.
+
+ -- Samuel Thibault <sthibault@debian.org>  Tue, 07 Jul 2020 18:05:31 +0200
+
 llvm-toolchain-snapshot (1:11~++20200701093119+ffee8040534-1~exp1) experimental; urgency=medium
 
   * New snapshot release
diff --git a/debian/patches/hurd/hurd-EIEIO-undef.diff b/debian/patches/hurd/hurd-EIEIO-undef.diff
deleted file mode 100644
index 10bae870..00000000
--- a/debian/patches/hurd/hurd-EIEIO-undef.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/llvm/utils/TableGen/CodeEmitterGen.cpp
-===================================================================
---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/llvm/utils/TableGen/CodeEmitterGen.cpp
-+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/llvm/utils/TableGen/CodeEmitterGen.cpp
-@@ -396,6 +396,9 @@ void CodeEmitterGen::run(raw_ostream &o)
-   ArrayRef<const CodeGenInstruction*> NumberedInstructions =
-     Target.getInstructionsByEnumValue();
- 
-+  o << "// Undef for HURD\n";
-+  o << "#ifdef EIEIO\n#undef EIEIO\n#endif\n";
-+
-   const CodeGenHwModes &HWM = Target.getHwModes();
-   // The set of HwModes used by instruction encodings.
-   std::set<unsigned> HwModes;
diff --git a/debian/patches/hurd/hurd-cxx-paths.diff b/debian/patches/hurd/hurd-cxx-paths.diff
deleted file mode 100644
index 1d46698b..00000000
--- a/debian/patches/hurd/hurd-cxx-paths.diff
+++ /dev/null
@@ -1,65 +0,0 @@
-hurd: find c++ headers
-
-This should be factorized with Linux.cpp and the GNU/kFreeBSD case.
-
-Index: llvm-toolchain-snapshot_11~++20200207025749+c29003813ab/clang/lib/Driver/ToolChains/Hurd.cpp
-   addPathIfExists(D, SysRoot + "/usr/lib/" + MultiarchTriple, Paths);
-   addPathIfExists(D, SysRoot + "/usr/lib/../" + OSLibDir, Paths);
- 
--  // If we are currently running Clang inside of the requested system root, add
--  // its parent library path to those searched.
-+  // Try walking via the GCC triple path in case of biarch or multiarch GCC
-+  // installations with strange symlinks.
-+  if (GCCInstallation.isValid()) {
-+    addPathIfExists(D,
-+                    SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() +
-+                        "/../../" + OSLibDir,
-+                    Paths);
-+
-+    // Add the 'other' biarch variant path
-+    Multilib BiarchSibling;
-+    if (GCCInstallation.getBiarchSibling(BiarchSibling)) {
-+      addPathIfExists(D, GCCInstallation.getInstallPath() +
-+                             BiarchSibling.gccSuffix(),
-+                      Paths);
-+    }
-+
-+    // See comments above on the multilib variant for details of why this is
-+    // included even from outside the sysroot.
-+    const std::string &LibPath = GCCInstallation.getParentLibPath();
-+    const llvm::Triple &GCCTriple = GCCInstallation.getTriple();
-+    const Multilib &Multilib = GCCInstallation.getMultilib();
-+    addPathIfExists(D, LibPath + "/../" + GCCTriple.str() + "/lib" +
-+                           Multilib.osSuffix(),
-+                    Paths);
-+
-+    // See comments above on the multilib variant for details of why this is
-+    // only included from within the sysroot.
-+    if (StringRef(LibPath).startswith(SysRoot))
-+      addPathIfExists(D, LibPath, Paths);
-+  }
-+
-+  // Similar to the logic for GCC above, if we are currently running Clang
-+  // inside of the requested system root, add its parent library path to those
-+  // searched.
-   // FIXME: It's not clear whether we should use the driver's installed
-   // directory ('Dir' below) or the ResourceDir.
-   if (StringRef(D.Dir).startswith(SysRoot))
-@@ -157,6 +189,17 @@ void Hurd::AddClangSystemIncludeArgs(con
- 
-   // Lacking those, try to detect the correct set of system includes for the
-   // target triple.
-+
-+  // Add include directories specific to the selected multilib set and multilib.
-+  if (GCCInstallation.isValid()) {
-+    const auto &Callback = Multilibs.includeDirsCallback();
-+    if (Callback) {
-+      for (const auto &Path : Callback(GCCInstallation.getMultilib()))
-+        addExternCSystemIncludeIfExists(
-+            DriverArgs, CC1Args, GCCInstallation.getInstallPath() + Path);
-+    }
-+  }
-+
-   if (getTriple().getArch() == llvm::Triple::x86) {
-     std::string Path = SysRoot + "/usr/include/i386-gnu";
-     if (D.getVFS().exists(Path))
diff --git a/debian/patches/series b/debian/patches/series
index 2da2f8b7..c17f4ad1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -97,9 +97,6 @@ remove-apple-clang-manpage.diff
 0049-Use-Debian-provided-MathJax-everywhere.patch
 
 # Hurd port
-# Disable for now as it breaks the ci:
-#  /build/llvm-toolchain-snapshot-11~++20200210115111+5e1d7bb6798/clang/lib/Driver/ToolChains/Hurd.cpp:110:66: error: invalid initialization of reference of type 'const string& {aka const std::__cxx11::basic_string<char>&}' from expression of type 'llvm::StringRef'
-#hurd/hurd-cxx-paths.diff
 hurd/hurd-pathmax.diff
 
 # powerpcspe