--- a/.hgtags
+++ b/.hgtags
@@ -662,3 +662,5 @@ 94a35822a8d9dfc6458a2353168e37a21b16ea29
 8dcbdc30cd49d1d03e3a21b37671d567d84943ae Dec2016_15
 94a35822a8d9dfc6458a2353168e37a21b16ea29 Dec2016_SP3_release
 8dcbdc30cd49d1d03e3a21b37671d567d84943ae Dec2016_SP3_release
+07824a1c7beb75308b813378af33c243f1c2f511 Dec2016_17
+07824a1c7beb75308b813378af33c243f1c2f511 Dec2016_SP4_release

--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -132,7 +132,7 @@ Vendor: MonetDB BV <info@monetdb.org>
 Group: Applications/Databases
 License: MPLv2.0
 URL: http://www.monetdb.org/
-Source: http://dev.monetdb.org/downloads/sources/Dec2016-SP3/%{name}-%{version}.tar.bz2
+Source: http://dev.monetdb.org/downloads/sources/Dec2016-SP4/%{name}-%{version}.tar.bz2
 
 # we need systemd for the _unitdir macro to exist
 %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
@@ -953,6 +953,22 @@ rm -f %{buildroot}%{_bindir}/Maddlog
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Apr 11 2017 Sjoerd Mullender <sjoerd@acm.org> - 11.25.17-20170411
+- Rebuilt.
+- BZ#6110: cast of a SQL boolean value to a string or clob or (var)char
+  is wrong
+- BZ#6254: Crash (and assertion failure) after querying a view which
+  uses a correlated subquery in the select-list
+- BZ#6256: Assertion Trigger on FULL OUTER JOIN with more than two
+  BETWEEN clauses
+- BZ#6257: wrong count values (1 instead of 0) for correlated aggregation
+  queries
+- BZ#6258: Vulnerability in FITS and NETCDF data vaults
+
+* Tue Apr 11 2017 Sjoerd Mullender <sjoerd@acm.org> - 11.25.17-20170411
+- sql: Upgrade code was added for an old change in the sys.settimeout function.
+- sql: A bug was fixed with the automatic "vacuum" operation on system tables.
+
 * Thu Mar 30 2017 Sjoerd Mullender <sjoerd@acm.org> - 11.25.15-20170330
 - Rebuilt.
 - BZ#6250: Assertion failure when querying a Blob column with order

--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+monetdb (11.25.17) unstable; urgency=low
+
+  * Rebuilt.
+  * BZ#6110: cast of a SQL boolean value to a string or clob or (var)char
+    is wrong
+  * BZ#6254: Crash (and assertion failure) after querying a view which
+    uses a correlated subquery in the select-list
+  * BZ#6256: Assertion Trigger on FULL OUTER JOIN with more than two
+    BETWEEN clauses
+  * BZ#6257: wrong count values (1 instead of 0) for correlated aggregation
+    queries
+  * BZ#6258: Vulnerability in FITS and NETCDF data vaults
+
+ -- Sjoerd Mullender <sjoerd@acm.org>  Tue, 11 Apr 2017 12:49:56 +0200
+
+monetdb (11.25.17) unstable; urgency=low
+
+  * sql: Upgrade code was added for an old change in the sys.settimeout function.
+  * sql: A bug was fixed with the automatic "vacuum" operation on system tables.
+
+ -- Sjoerd Mullender <sjoerd@acm.org>  Tue, 11 Apr 2017 12:49:56 +0200
+
 monetdb (11.25.15) unstable; urgency=low
 
   * Rebuilt.

--- a/libversions
+++ b/libversions
@@ -36,7 +36,7 @@
 
 # version of the GDK library (subdirectory gdk; also includes
 # common/options and common/utils)
-GDK_VERSION=14:4:1
+GDK_VERSION=14:5:1
 
 # version of the MAPI library (subdirectory clients/mapilib)
 MAPI_VERSION=8:1:0

--- a/sql/ChangeLog-Archive
+++ b/sql/ChangeLog-Archive
@@ -1,6 +1,10 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Tue Apr 11 2017 Sjoerd Mullender <sjoerd@acm.org> - 11.25.17-20170411
+- Upgrade code was added for an old change in the sys.settimeout function.
+- A bug was fixed with the automatic "vacuum" operation on system tables.
+
 * Wed Aug  3 2016 Sjoerd Mullender <sjoerd@acm.org> - 11.25.1-20161214
 - Removed functions sys.zorder_encode, sys.zorder_decode_x, and
   sys.zorder_decode_y.

--- a/sql/ChangeLog.Dec2016
+++ b/sql/ChangeLog.Dec2016
@@ -1,7 +1,3 @@
 # ChangeLog file for sql
 # This file is updated with Maddlog
 
-* Tue Apr 11 2017 Sjoerd Mullender <sjoerd@acm.org>
-- Upgrade code was added for an old change in the sys.settimeout function.
-- A bug was fixed with the automatic "vacuum" operation on system tables.
-