diff --git a/CHANGES b/CHANGES
index 5ee1e624..030ab609 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,16 @@
 HikariCP Changes
 
+Changes in 2.4.0
+
+ * Consolidated distribution into single JVM target (Java 7).  Java 6 support has
+   entered maintenance mode and bug fixes will continue on the 2.3.x branch.
+
+ * Pool configuration properties and DataSource methods previously marked as
+   @Deprecated have been removed.
+
+ * Allow explicit definition of driverClassName to override DriverManager.getDriver(url)
+   located driver.
+
 Changes in 2.3.5
 
  * Fixed regression caused by enhancement #279 that imposed a runtime dependency on
@@ -8,7 +19,7 @@ Changes in 2.3.5
 Changes in 2.3.4
 
  * Fixed class cast exception when setting the HealthCheckRegistry via JNDI lookup.
- 
+
  * Allow Dropwizard MetricRegistry/HealthCheckRegistry to be set after pool startup --
    one time only.
 
@@ -18,7 +29,7 @@ Changes in 2.3.4
  * Removed deprecation from connectionInitSql, it will be allowed.
 
  * Made suspect/resume lock non-static (should be be shared across pools).
- 
+
  * Improved unwrap() behavior in the Hibernate HikariConnectionProvider.
 
  * Improved leak detection log
@@ -28,7 +39,7 @@ Changes in 2.3.3
  * Fixed bad interaction with PostgeSQL JDBC driver whereby a SQLException thrown by
    PostgreSQL where the getNextException() call returns the original exception and causes
    an infinite loop in HikariCP (and eventual stack overflow).
-   
+
  * Throw a typed Exception rather than a simple RuntimeException when pool initialization
    fails.
 
@@ -83,7 +94,7 @@ Changes in 2.3.0
 
  * Allow a lower leakDetectionThreshold of 2 seconds.
 
- * Fixed bug when using the HikariJNDIFactory that required the presence of 
+ * Fixed bug when using the HikariJNDIFactory that required the presence of
    Codahale metrics.
 
  * Support initializationFailFast even when minimumIdle = 0
@@ -99,7 +110,7 @@ Changes in 2.2.5
 
  * Implement full transaction state tracking.  This allows HikariCP to bypass
    the automatic rollback when connections are returned to the pool if the
-   transaction state is "clean". 
+   transaction state is "clean".
 
  * Rename MBean closeIdleConnections() to softEvictConnections() and implement
    "evict on return" semantics.
@@ -113,7 +124,7 @@ Changes in 2.2.5
    the user has not configured an isolation level (using the default).
 
  * Fix a bug where DataSource.loginTimeout() was always being set to 1 second.
- 
+
  * Fix bug where some drivers return 0 from Connection.getNetworkTimeout(),
    and yet throw SQLFeatureNotSupportedException when setNetworkTimeout() is
    called. This broke they way that HikariCP had implemented JDBC 4.1 support
@@ -174,7 +185,7 @@ Changes in 2.1.0
 
  * Fixed accounting issue with totalConnections when aborting connections
    during shutdown, causing a warning message to be logged.
- 
+
  * Fixed regression in Java 8 codeline that would prevent minimumIdle from
    being set before maxPoolSize.
 
@@ -206,7 +217,7 @@ Changes in 2.0.1
  * Fixed issue tracking the statements when there are mixed statement
    types (Statement, PreparedStatement, etc.) open on the connection and
    the number of unclosed statements exceeds 32.
- 
+
  * Fixed issue where housekeeping threads would add idle connections
    even when minimumIdle was 0.
 
@@ -217,7 +228,7 @@ Changes in 2.0.1
 
  * Integrated change to allow specifying a ThreadGroup for thread
    creation is certain restricted environments.
- 
+
 Changes in 1.4.0
 
  *) Fix bug that did not allow minIdle property to be set.
@@ -314,7 +325,7 @@ Changes in 1.3.3
 Changes in 1.3.2
 
  *) Java 6 compatibility.
- 
+
  *) HikariDataSource now extends HikariConfig, so pool properties can be
     set directly on a HikariDataSource without need to create a  HikariConfig.
     The cost of doing so is a small runtime cost due to the fact that an
@@ -393,7 +404,7 @@ Changes in 1.2.6
     Statements existed at the time of Connection.close().
 
  *) Fixed incorrect pom.xml dependency on Hibernate.
- 
+
 Changes in 1.2.5
 
  *) Instrumentation mode (agent) removed due to narrowing gap between
@@ -413,7 +424,7 @@ Changes in 1.2.5
     transaction isolation level.
 
  *) Fixed issue where idleTimeout could not be set to 0, thereby disabling
-    it. Incorrect value validation caused 0 to be rejected as a valid value. 
+    it. Incorrect value validation caused 0 to be rejected as a valid value.
 
 Changes in 1.2.4
 
@@ -466,4 +477,3 @@ Changes in 1.1.9
 
  *) Added setDataSourceProperties() setter to HikariConfig to
     allow easier configuration though Spring.
-