--- a/ChangeLog
+++ b/ChangeLog
@@ -1,82 +1,3 @@
-# ChangeLog file for java
+# ChangeLog file for monetdb-java
 # This file is updated with Maddlog
 
-* Thu Nov 17 2016 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
-- The MapiSocket object now supports getting and setting the
-  socket timeout, even before the TCP socket is created.  To set
-  the socket timeout specify it in the JDBC URL, for example:
-    jdbc:monetdb://localhost:50000/demo?so_timeout=8000
-  This enables the timeout and sets it to 8000 milliseconds (= 8 seconds).
-  By default the timeout is not set, so wait infinitely.
-
-* Thu Nov 10 2016 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
-- Implemented Connection methods: getClientInfo(name) and getClientInfo().
-  They used to return null and empty Properties object.
-  Corrected implementation of Connection methods: setClientInfo(name, value)
-  and setClientInfo(properties). They are now processed as expected.
-  Corrected implementation of Connection.setHoldability(holdability). It now
-  throws an SQLFeatureNotSupportedException when holdability is not
-  ResultSet.HOLD_CURSORS_OVER_COMMIT (which is the only supported holdability).
-
-* Thu Oct 13 2016 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
-- Corrected implementation of java.sql.Wrapper methods isWrapperFor()
-  and unwrap().  They now properly return expected results instead of
-  always return false or throw an SQLException.
-
-* Thu Oct  6 2016 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
-- Corrected return values of DatabaseMetaData methods nullsAreSortedHigh(),
-  nullsAreSortedLow(), getMaxCursorNameLength(), getMaxProcedureNameLength(),
-  getMaxStatementLength() and getMaxUserNameLength().
-  Improved return values of DatabaseMetaData methods getMaxBinaryLiteralLength(),
-  getMaxCharLiteralLength() and getMaxColumnsInTable().
-- Implemented Statement methods: getQueryTimeout() and setQueryTimeout(int
-  seconds).  getQueryTimeout() used to always return 0, now it returns the
-  query timeout retrieved from the server.  setQueryTimeout(int seconds)
-  used to always throw SQLException: query time outs not supported.
-  Now it sets the query timeout for the current connection/session on
-  the server.
-
-* Thu Sep 29 2016 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
-- Corrected ResultSet methods: getByte(), getBigDecimal(), getShort(),
-  getInt(), getLong(), getFloat() and getDouble() in case the conversion
-  to the native type failed due to a Number Format conversion error.
-  It used to silently ignore the conversion error and return 0 instead,
-  which is not correct.  Now it throws an SQLException with message
-  "Could not convert value to a number." and SQLstate "22003" meaning:
-  Numeric value out of range.
-
-* Thu Sep 22 2016 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
-- Improved JdbcClient program when doing dump of table definition.  It now
-  outputs CREATE TABLE definition more similar to mclient program.
-
-* Thu Sep 15 2016 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
-- Improved performance of following JDBC ResultSet and ResultSetMetaData
-  methods:
-  - ResultSet.getBoolean(column)
-  - ResultSet.getBinaryStream(column)
-  - ResultSet.getBytes(column)
-  - ResultSet.getObject(column)
-  - ResultSet.getObject(column, map)
-  - ResultSet.getDate(column)
-  - ResultSet.getTime(column)
-  - ResultSet.getTimestamp(column)
-  - ResultSet.getDate(column, calendar)
-  - ResultSet.getTime(column, calendar)
-  - ResultSet.getTimestamp(column, calendar)
-  - ResultSetMetaData.getColumnClassName(column)
-  - ResultSetMetaData.getColumnType(column)
-  - ResultSetMetaData.isCaseSensitive(column)
-  - ResultSetMetaData.isSigned(column)
-  - ResultSetMetaData.getPrecision(column)
-
-* Thu Sep  8 2016 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
-- Improved JdbcClient program by fixing some resource leaks.
-- Extended JdbcClient program by showing elapsed time information for each
-  query or command when started in interactive mode (no -f was used at startup).
-
-* Thu Sep  1 2016 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
-- Improved fetching and output speed of JdbcClient program for query results.
-
-* Thu Aug 11 2016 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
-- Improved performance of method ResultSet.getObject(column_ID) significantly.
-