diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6f9af063..d6e32754b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ FEATURES:
 
 IMPROVEMENTS:
 
+* agent: Added an error at agent startup time if both `-ui` and `-ui-dir` are configured together. [GH-2576]
+
 BUG FIXES:
 
 ## 0.8.1 (April 17, 2017)