diff --git a/.gitignore b/.gitignore
index b53f60db79205a7889705e8b211596a70f53b404..d9d3967a12c6c2a32caad71e1e82d1080a9bcb3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,8 @@ TAGS.sub
 .lvimrc
 
 .clang-format
+.clangd
+compile_commands.json
 
 .gdbinit
 .gdb_history
diff --git a/ChangeLog b/ChangeLog
index 3cd3137c7f0cfbf1f6da4f66fcc154988ba8cf02..1dcd7663491a1d90e808d49a4397e207a015bbac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-08-28  Martin Liska  <mliska@suse.cz>
+
+	* .gitignore: Add .clangd and compile_commands.json
+	to .gitignore.
+
 2019-08-23  Michael Forney  <mforney@mforney.org>
 
 	* Makefile.tpl (HOST_EXPORTS): Add CXX_FOR_BUILD.