diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9d3725f..be089ae1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 # unreleased
+- Handle file extension conflicts in --list-languages, see #1076 and #1135 (@Kienyew)
 
 
 ## Features