diff --git a/debian/changelog b/debian/changelog
index e6f32127..dd83aa21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
-llvm-toolchain-3.4 (1:3.4.2-7~exp2) UNRELEASED; urgency=medium
+llvm-toolchain-3.4 (1:3.4.2-7) unstable; urgency=medium
 
-  * try to bring back lldb on mips & mipsel 
+  * Upload in unstable
+  * Try to bring back lldb on mips & mipsel
   * Force scan-build to use the same version of clang
+  * Try to fix hurd (hurd-EIEIO-undef.diff)
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 05 Aug 2014 14:40:05 +0200
 
@@ -26,7 +28,7 @@ llvm-toolchain-3.4 (1:3.4.2-6) unstable; urgency=medium
   * hurd-EIEIO-undef.diff: try to undef an errno.h to fix the ftbfs
   * clang-X suggests clang-X-doc (Closes: #755922)
   * Manage all files using .in mecanism. It will simplify the upgrade of
-    version + file names 
+    version + file names
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 23 Jul 2014 13:02:56 +0200
 
diff --git a/debian/patches/hurd-EIEIO-undef.diff b/debian/patches/hurd-EIEIO-undef.diff
index 02f409e8..f328829e 100644
--- a/debian/patches/hurd-EIEIO-undef.diff
+++ b/debian/patches/hurd-EIEIO-undef.diff
@@ -1,14 +1,14 @@
-Index: llvm-toolchain-3.4-3.4.2/utils/TableGen/InstrInfoEmitter.cpp
+Index: llvm-toolchain-3.4-3.4.2/utils/TableGen/CodeEmitterGen.cpp
 ===================================================================
---- llvm-toolchain-3.4-3.4.2.orig/utils/TableGen/InstrInfoEmitter.cpp
-+++ llvm-toolchain-3.4-3.4.2/utils/TableGen/InstrInfoEmitter.cpp
-@@ -569,6 +569,9 @@ void InstrInfoEmitter::emitEnums(raw_ost
-   OS << "\n#ifdef GET_INSTRINFO_ENUM\n";
-   OS << "#undef GET_INSTRINFO_ENUM\n";
+--- llvm-toolchain-3.4-3.4.2.orig/utils/TableGen/CodeEmitterGen.cpp
++++ llvm-toolchain-3.4-3.4.2/utils/TableGen/CodeEmitterGen.cpp
+@@ -244,6 +244,9 @@ void CodeEmitterGen::run(raw_ostream &o)
+   const std::vector<const CodeGenInstruction*> &NumberedInstructions =
+     Target.getInstructionsByEnumValue();
  
-+  OS << "// Undef for HURD\n";
-+  OS << "#ifdef EIEIO\n#undef EIEIO\n#endif\n";
++  o << "// Undef for HURD\n";
++  o << "#ifdef EIEIO\n#undef EIEIO\n#endif\n";
 +
-   OS << "namespace llvm {\n\n";
- 
-   CodeGenTarget Target(Records);
+   // Emit function declaration
+   o << "uint64_t " << Target.getName();
+   if (MCEmitter)