diff --git a/debian/changelog b/debian/changelog
index 53bb8bbf..a07ae5aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+llvm-toolchain-5.0 (1:5.0.1-2) unstable; urgency=medium
+
+  * Bring back the libedit support in lldb
+    Fix upstream bug https://bugs.llvm.org/show_bug.cgi?id=35291
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 22 Dec 2017 11:42:46 +0100
+
 llvm-toolchain-5.0 (1:5.0.1-1) unstable; urgency=medium
 
   * New stable release
diff --git a/debian/rules b/debian/rules
index 9681c267..74a56572 100755
--- a/debian/rules
+++ b/debian/rules
@@ -152,7 +152,8 @@ ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH)))
 		LLDB_ENABLE=no
 else
 # See https://llvm.org/bugs/show_bug.cgi?id=28898
-	CMAKE_EXTRA += -DLLDB_DISABLE_LIBEDIT=ON
+# Enable it again as it seems it is fixed upstream https://bugs.llvm.org/show_bug.cgi?id=35291
+#	CMAKE_EXTRA += -DLLDB_DISABLE_LIBEDIT=ON
 endif
 
 LLD_ENABLE=yes