diff --git a/ChangeLog b/ChangeLog
index 924dbc8fc..cf33bc302 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,121 @@
+commit 67017a26e9a52050d024f107373b576893caf4e2
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Tue Oct 23 15:07:09 2018 -0400
+
+    Preparation for release 4.0.4
+
+M	Documentation/docbook/xsl/sogo-fo.xsl
+M	Documentation/docinfo.xml
+M	Documentation/includes/global-attributes.asciidoc
+M	NEWS
+M	Version
+
+commit 6f1d2330d8be1cef47872f91ba534b61abc8240a
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Tue Oct 23 15:06:55 2018 -0400
+
+    (js/css) Update generated files
+
+M	UI/WebServerResources/js/Common.js
+M	UI/WebServerResources/js/Common.js.map
+M	UI/WebServerResources/js/Scheduler.js
+M	UI/WebServerResources/js/Scheduler.js.map
+M	UI/WebServerResources/js/Scheduler.services.js
+M	UI/WebServerResources/js/Scheduler.services.js.map
+
+commit 36cb0e65d989724d69e9d3cf0dbc0d66e42d2dbc
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Tue Oct 23 15:03:35 2018 -0400
+
+    (i18n) Update Portuguese translation
+
+M	SoObjects/Appointments/Portuguese.lproj/Localizable.strings
+M	UI/Common/Portuguese.lproj/Localizable.strings
+M	UI/Contacts/Portuguese.lproj/Localizable.strings
+M	UI/MailerUI/Portuguese.lproj/Localizable.strings
+M	UI/PreferencesUI/Portuguese.lproj/Localizable.strings
+M	UI/Scheduler/Portuguese.lproj/Localizable.strings
+
+commit ee001243b2aa9fb65305e4c9ff73a20cd99a8883
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Tue Oct 23 14:25:58 2018 -0400
+
+    (js) Globally load custom stylesheets
+
+    This is required to generate the static theme (theme-default.css)
+
+M	NEWS
+M	UI/WebServerResources/css/theme-default.css
+M	UI/WebServerResources/js/Common/Common.app.js
+M	UI/WebServerResources/js/Scheduler/Scheduler.app.js
+
+commit 35ea86557ccde403ce44898a8a4ff96333e135d7
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Mon Oct 22 12:08:46 2018 -0400
+
+    Fix time conflict validation when not owner
+
+M	NEWS
+M	SoObjects/Appointments/SOGoAppointmentObject.m
+
+commit 59c3bdc2422cd893e9cc068231105e7ff4fec5e6
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Mon Oct 22 11:20:06 2018 -0400
+
+    Fix time conflict validation
+
+M	SoObjects/Appointments/SOGoAppointmentObject.m
+
+commit 04555b1e14625a315b99ed5c569b1604f9fdb3ed
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Thu Oct 18 15:32:08 2018 -0400
+
+    Fix translations
+
+    Add missing keys, remove duplicate keys, avoid exception on missing
+    calendar categories.
+
+M	UI/PreferencesUI/Icelandic.lproj/Localizable.strings
+M	UI/PreferencesUI/Lithuanian.lproj/Localizable.strings
+M	UI/PreferencesUI/Macedonian.lproj/Localizable.strings
+M	UI/PreferencesUI/UIxPreferences.m
+M	UI/PreferencesUI/Welsh.lproj/Localizable.strings
+
+commit 48f2677aad729df4eb8a63bbbe25eb2b1129844f
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Thu Oct 18 14:40:13 2018 -0400
+
+    Remove duplicate short date formats in German
+
+M	UI/PreferencesUI/German.lproj/Localizable.strings
+
+commit bf946cb108ec4a41bbc53616f9bf6ed1ef9f23a9
+Author: InverseBot <sogo@inverse.ca>
+Date:   Thu Oct 18 00:36:30 2018 -0400
+
+    (js/css) Update generated files
+
+M	UI/WebServerResources/js/Common.js
+M	UI/WebServerResources/js/Common.js.map
+M	UI/WebServerResources/js/Scheduler.services.js
+M	UI/WebServerResources/js/Scheduler.services.js.map
+
+commit c4c7cf1742a02017c0f2947ad555a3f5a5d434d2
+Author: Jordi Mallach <jordi@debian.org>
+Date:   Thu Oct 18 02:23:53 2018 +0200
+
+    Fix typo #elseif introduced in c8f7df402c96b785f23cbed42e0c84aeafa1daef.
+
+M	UI/MailPartViewers/UIxMailPartSignedViewer.m
+
+commit 5de5e9e068184c857df2ddc121f72411dd1ae364
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Wed Oct 17 11:18:38 2018 -0400
+
+    Update ChangeLog
+
+M	ChangeLog
+
 commit 0e731452ee5122079c5f850d829233241015b8e9
 Author: Francis Lachapelle <flachapelle@inverse.ca>
 Date:   Wed Oct 17 11:18:04 2018 -0400