diff --git a/CHANGELOG b/CHANGELOG
index da1a04cb44..e5687003d7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -47,6 +47,7 @@ Version 2018.05 (2018-05-xx)
     Fixed a bug that accounts from diaspora* could join private forums automatically [annando]
     Fixed a bug that prevented the selection of displayed profiles for other Friendica contacts [MrPetovan]
     Fixed the version sorting in the federation statistics page [annando]
+    Fixed a bug in the nodeinfo calculation of total comments [annando]
     Added an optional module to display the Terms of Service [tobiasd]
     Added testfeed module [MrPetovan]
     Added hashtag autocomplete (ported from Hubzilla) [rabuzarus]
@@ -92,7 +93,7 @@ Version 2018.05 (2018-05-xx)
     4760, 4772, 4786, 4790, 4791, 4816, 4867, 4878, 4819, 4860, 4876,
     4879, 4886, 4898, 4899, 4902, 4921, 4926, 4927, 4928, 4938, 4943,
     4946, 4947, 4965, 4976, 4966, 4994, 4997, 5002, 5014, 5033, 5043,
-    5050, 5051, 5056, 5063
+    5050, 5051, 5056, 5063, 5111
 
 Version 3.6 (2018-03-23)
   Friendica Core:
@@ -189,6 +190,8 @@ Version 3.6 (2018-03-23)
     Updates to the translations (DE, EN_GB, ES, FR, IT, NL, ZH_CN) [translation teams]
     all bridges don't relay postings anymore that are posted to a public forum [annando]
     DAV addon marked unsupported [tobiasd]
+    communityhome addon marked unsupported [MrPetovan]
+    yourls addon makrked unsupported [Benjamin Lorteau]
     Current Weather: fixing a problem with the weathermap link [zeroadam]
     NSFW added config examples, reworked the description, now ignores the CW from Mastodon [andyhee, annando, rebeka-catalina]
     Twitter support 280 chars limit [annando]
@@ -198,7 +201,7 @@ Version 3.6 (2018-03-23)
     Public Server reworked [annando]
     pageheader settings beautifications [tobiasd]
     mailstream settings beautifications [tobiasd]
-    Membersince is now part of the core [rabuzarus]
+    Membersince is now part of the core, addon marked unsupported [rabuzarus]
     Forum posts are not transmitted over the connectors anymore [annando]
 
   Friendica Dir: