diff --git a/debian/changelog b/debian/changelog
index b1f34b58..dbc83fc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-llvm-toolchain-snapshot (1:3.6~svn214630-1~exp2) UNRELEASED; urgency=medium
+llvm-toolchain-snapshot (1:3.6~svn215195-1) unstable; urgency=medium
 
+  * Upload in unstable
   * Enable compressed debug sections (Closes: #757002)
   * Force scan-build to use the same version of clang
   * Old JIT has been removed. 0050-powerpcspe-fp.diff is useless
+  * try to build lldb-gdbserver under kfreebsd (kfreebsd-lldb-gdbserver.diff)
+  * Second try to fix build under HURD (hurd-EIEIO-undef.diff)
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 04 Aug 2014 13:36:15 +0200
 
diff --git a/debian/patches/hurd-EIEIO-undef.diff b/debian/patches/hurd-EIEIO-undef.diff
index 02f409e8..a7c30e53 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-snapshot-3.6~svn215188/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-snapshot-3.6~svn215188.orig/utils/TableGen/CodeEmitterGen.cpp
++++ llvm-toolchain-snapshot-3.6~svn215188/utils/TableGen/CodeEmitterGen.cpp
+@@ -241,6 +241,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)
diff --git a/debian/patches/kfreebsd-lldb-gdbserver.diff b/debian/patches/kfreebsd-lldb-gdbserver.diff
new file mode 100644
index 00000000..6b10091c
--- /dev/null
+++ b/debian/patches/kfreebsd-lldb-gdbserver.diff
@@ -0,0 +1,13 @@
+Index: llvm-toolchain-3.5-3.5~+rc2/lldb/tools/Makefile
+===================================================================
+--- llvm-toolchain-3.5-3.5~+rc2.orig/lldb/tools/Makefile
++++ llvm-toolchain-3.5-3.5~+rc2/lldb/tools/Makefile
+@@ -13,7 +13,7 @@ include $(LLDB_LEVEL)/../../Makefile.con
+ DIRS :=
+ 
+ # enable lldb-gdbserver for supported platforms
+-ifneq (,$(strip $(filter $(HOST_OS), FreeBSD Linux)))
++ifneq (,$(strip $(filter $(HOST_OS), FreeBSD Linux GNU/kFreeBSD)))
+ DIRS += lldb-gdbserver
+ endif
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 5fa9e83a..f1777704 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -40,3 +40,4 @@ follow-parallel-var.diff
 lldb-kfreebsd.diff
 hurd-EIEIO-undef.diff
 silent-MCJIIT-tests.diff
+kfreebsd-lldb-gdbserver.diff