diff --git a/ChangeLog.txt b/ChangeLog.txt
index 661ec2f1..930b05eb 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,10 +1,9 @@
 1.5 - 2018xxxx
 ==============
 
-Broker:
+Broker features:
 - Add per_listener_settings to allow authentication and access control to be
   per listener.
-- Fix UNSUBSCRIBE with no topic is accepted on MQTT 3.1.1. Closes #665.
 - Add ability to deny access to SUBSCRIBE messages as well as the current
   read/write accesses. Currently for auth plugins only.
 - Reduce calls to malloc through the use of UHPA.
@@ -18,29 +17,40 @@ Broker:
     sending additional PUBLISH or PUBREL would not help the client catch
     up. Once the backlog has cleared the client will respond. If it is not
     able to catch up, sending additional duplicates would not help either.
-- Produce an error if two bridges share the same local_clientid.
 - Add use_subject_as_username option for certificate based client
   authentication to use the entire certificate subject as a username, rather
   than just the CN. Closes #469467.
-- Add systemd startup notification and services. Closes #471053.
-- Reduce unnecessary malloc and memcpy when receiving a message and storing
-  it. Closes #470258.
 - Change sys tree printing output. This format shouldn't be relied upon and
   may change at any time. Closes #470246.
 - Minimum supported libwebsockets version is now 1.3.
+- Add systemd startup notification and services. Closes #471053.
+- Reduce unnecessary malloc and memcpy when receiving a message and storing
+  it. Closes #470258.
 - Support for Windows XP has been dropped.
-- Miscellaneous fixes on Windows.
 - Bridge connections now default to using MQTT v3.1.1.
 - mosquitto_db_dump tool can now output some stats on clients.
-- perform utf-8 validation on incoming will, subscription and unsubscription
+- Perform utf-8 validation on incoming will, subscription and unsubscription
   topics.
 - new $SYS/broker/store/messages/count (deprecates $SYS/broker/messages/stored)
 - new $SYS/broker/store/messages/bytes
 - max_queued_bytes feature to limit queues by real size rather than
   than just message count. Closes Eclipse #452919 or Github #100
+- Add support for bridges to be configured to only send notifications to the
+  local broker.
+- Add set_tcp_nodelay option to allow Nagle's algorithm to be disabled on
+  client sockets. Closes #433.
+- The behaviour of allow_anonymous has changed. In the old behaviour, the
+  default if not set was to allow anonymous access. The new behaviour is to
+  default is to allow anonymous access unless another security option is set.
+  For example, if password_file is set and allow_anonymous is not set, then
+  anonymous access will be denied. It is still possible to allow anonymous
+  access by setting it explicitly.
+
+Broker fixes:
+- Fix UNSUBSCRIBE with no topic is accepted on MQTT 3.1.1. Closes #665.
+- Produce an error if two bridges share the same local_clientid.
+- Miscellaneous fixes on Windows.
 - queue_qos0_messages was not observing max_queued_** limits
-- Add support bridges to be configured to only send notifications to the local
-  broker.
 - When using the include_dir configuration option sort the files
   alphabetically before loading them.  Closes #17.
 - IPv6 is no longer disabled for websockets listeners.
@@ -62,16 +72,8 @@ Broker:
 - Fix upgrade_outgoing_qos for retained message. Closes #534.
 - Fix CONNACK message not being sent for unauthorised connect on websockets.
   Closes #8.
-- Add set_tcp_nodelay option to allow Nagle's algorithm to be disabled on
-  client sockets. Closes #433.
-- The behaviour of allow_anonymous has changed. In the old behaviour, the
-  default if not set was to allow anonymous access. The new behaviour is to
-  default is to allow anonymous access unless another security option is set.
-  For example, if password_file is set and allow_anonymous is not set, then
-  anonymous access will be denied. It is still possible to allow anonymous
-  access by setting it explicitly.
 
-Client library:
+Client library features:
 - Outgoing messages with QoS>1 are no longer retried after a timeout period.
   Messages will be retried when a client reconnects.
 - DNS-SRV support is now disabled by default.
@@ -91,6 +93,8 @@ Client library:
 - Add mosquitto_pub_topic_check2(), mosquitto_sub_topic_check2(), and
   mosquitto_topic_matches_sub2() which are identical to the similarly named
   functions but also take length arguments.
+
+Client library fixes:
 - Fix incorrect PSK key being used if it had leading zeroes.
 - Initialise "result" variable as soon as possible in
   mosquitto_topic_matches_sub. Closes #654.
@@ -98,7 +102,7 @@ Client library:
 - Fix mosquitto_topic_matches_sub() not correctly matching foo/bar against
   foo/+/#. Closes #670.
 
-Clients:
+Client features:
 - Add -F to mosquitto_sub to allow the user to choose the output format.
 - Add -U to mosquitto_sub for unsubscribing from topics.
 - Add -c (clean session) to mosquitto_pub.
@@ -106,10 +110,12 @@ Clients:
   messages.
 - Connections now default to using MQTT v3.1.1.
 - Default to using port 8883 when using TLS.
-- Correctly handle empty files with "mosquitto_pub -l". Closes #676.
 - mosquitto_sub doesn't continue to keep connecting if CONNACK tells it the
   connection was refused.
 
+Client fixes:
+- Correctly handle empty files with "mosquitto_pub -l". Closes #676.
+
 Build:
 - Add WITH_STRIP option (defaulting to "no") that when set to "yes" will strip
   executables and shared libraries when installing.