diff --git a/doc/General/Changelog.md b/doc/General/Changelog.md
index 8c1822b004..0d2c513bc0 100644
--- a/doc/General/Changelog.md
+++ b/doc/General/Changelog.md
@@ -3,9 +3,28 @@
 #### Bug fixes
   - WebUI:
     - Rename $ds to $ldap_connection for auth modules (PR3596)
+    - Fix the display of custom snmp ports (PR3646)
+    - Fix bugs in Create new / edit alert templates (PR3651)
+    - Fixed ajax_ calls for use with base_url (PR3661)
+    - Updated old frontpage to use new services format (PR3691)
+    - Order alerts by state to indicate which alerts are open (PR3692)
+    - Fixed maintenance windows showing as lapsed (PR3704)
+    - Removed duplicated dbInsert from dashboard creation (PR3761)
+    - Fixed 95th for graphs (PR3762)
+  - Polling / Discovery:
+    - Updated Poweralert divisor to 10 for sensors (PR3645)
+    - Fixed NX-OS version polling (PR3688)
+    - Fixed STP log spam from Mikrotik device (PR3689)
+    - Removed " from ZyWall version number (PR3693)
+    - Updated register_mib to use d_echo (PR3739)
+    - Fixed invalid SQL for BGP Discovery (PR3742)
+  - Alerting:
+    - Unacknowledged alerts will now continue to send alerts (PR3667)
   - Misc:
     - Fix smokeping path in gen_smokeping (PR3577)
     - Fix full include path in includes/polling/functions.inc.php (PR3614)
+    - Added port_id to tune_port.php query (PR3753)
+    - Updated port schema to support > 17.1 Gbs for _rate values (PR3754)
 
 #### Improvements
   - Added / improved detection for:
@@ -17,18 +36,43 @@
     - IBM Bladecenter switches (PR3623)
     - HWg support (PR3624)
     - IBM IMM (PR3625)
+    - ServerTech Sentry4 PDUs (PR3659)
+    - SwOS (PR3662)
+    - Sophos (R3678, PR3679, PR3736)
+    - OSX El Capitan (PR3690)
+    - DNOS (PR3703, PR3730)
+    - Cisco SB SG200 (PR3705)
+    - EMC FlareOS (PR3712)
+    - Enhance Brocade Fabric OS (PR3712)
+    - Huawei SmartAX (PR3737)
   - Polling / Discovery:
     - Use lsb_release in distro script (PR3580)
     - Allow lmsensors fanspeeds of 0 to be discovered (PR3616)
     - Added support for rrdcached application monitoring (PR3627)
+    - Improve the output of polling/debug to make it easier to see modules (PR3694)
   - WebUI:
     - Resolve some reported security issues (PR3586) With thanks to https://twitter.com/wireghoul
     - Order apps list alphabetically (PR3600)
     - Network map improvements (PR3602)
     - Added support for varying hostname formats in Oxidized integration (PR3617)
     - Added device hw/location on hover in alerts table (PR3621)
+    - Updated unpolled notification to link directly to those devices (PR3696)
+    - Added ability to search via IP for Graylog integration (PR3697)
+    - Optimised network map SQL (PR3715)
+    - Added support for wildcards in custom graph groups (PR3722)
+    - Added ability to override ifSpeed for ports (PR3752)
+    - Added sysName to global search (PR3757)
+  - Alerting:
+    - Added ability to use location in alert templates (PR3652)
+  - Documentation:
+    - Added docs on Auto discovery (PR3671)
+    - Updated InfluxDB docs (PR3673)
+    - Updated distributed polling docs (PR3675)
+    - Updated FAQs (PR3677)
   - Misc:
     - Added pivot table for device groups ready for V2 (PR3589)
+    - Added device_id column to eventlog (PR3682)
+    - Cleanup sensors and related tables + added constraints (PR3745)
 
 ### May 2016