Index: trunk/docs/Changelog
===================================================================
--- trunk/docs/Changelog	(revision 476)
+++ trunk/docs/Changelog	(revision 481)
@@ -1,5 +1,23 @@
-3.1.6:
-	* More modern and more complete VA_COPY autoconf macro
-	  (from the openwrt project)
+4.0.0:
+	* new -w CL option to wait on scan completion
+	* new option ReportCheckflags
+	* enhance testsuite to cover new functionality
+	* implement draft for change control integration:
+	  * new database format to store change flags
+	  * refactoring of db I/O and client/server code
+	  * option StartupLoadDelay
+	  * --create-database CL option
+	  * --outfile CL option
+	  * --binary, --list-filter CL options
+	  * --verify-database CL option
+	  * yulectl -c DELTA:<uuid> command
+	  * option SetDeltaRetryCount
+	  * option SetDeltaRetryInterval
+	  * update documentation
+	* remove old/unused code
+	* fix compiler warnings with gcc 5.1.0
+	* update config.sub, config.guess
+
+3.1.6 (08-06-2015):
 	* Modify testcompile.sh to remove 'smatch' and use 'clang'
 	  instead.
Index: trunk/docs/README.UPGRADE
===================================================================
--- trunk/docs/README.UPGRADE	(revision 476)
+++ trunk/docs/README.UPGRADE	(revision 481)
@@ -1,2 +1,17 @@
+to 4.0.0 and higher: if you use "ReportCheckflags = yes" (off by default),
+  you need to change the database scheme:
+
+  -- mysql:
+	  ALTER TABLE samhain.log ADD COLUMN checkflags_old BIGINT UNSIGNED;
+	  ALTER TABLE samhain.log ADD COLUMN checkflags_new BIGINT UNSIGNED;
+
+  -- postgres:
+	  ALTER TABLE samhain.log ADD COLUMN checkflags_old NUMERIC(20); 
+	  ALTER TABLE samhain.log ADD COLUMN checkflags_new NUMERIC(20);
+
+  --oracle:
+	  ALTER TABLE samhain.log ADD checkflags_old NUMBER(20); 
+	  ALTER TABLE samhain.log ADD checkflags_new NUMBER(20); 
+
 to 2.8.0 and higher: samhain supports IPv6 now, which means that the
   size of the 'ip' column in the database must be increased from
@@ -40,6 +55,4 @@
   -- this may cause spurious warnings about modified links, if you check
      against a database created with an earlier version of samhain 
-
-
 
 from lower to 2.3.x: the database scheme has changed slightly.