diff --git a/CHANGES b/CHANGES
index 1ae192f293..505cbeeefa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,15 @@
 
+2.2-beta-157 | 2013-10-25 11:11:17 -0700
+
+  * Extend the documentation of the SQLite reader/writer framework.
+    (Bernhard Amann)
+
+  * Fix inclusion of wrong example file in scripting tutorial.
+    Reported by Michael Auger @LM4K. (Bernhard Amann)
+
+  * Alternative fix for the thrading deadlock issue to avoid potential
+    performance impact. (Bernhard Amann)
+
 2.2-beta-152 | 2013-10-24 18:16:49 -0700
 
   * Fix for input readers occasionally dead-locking. (Robin Sommer)
diff --git a/VERSION b/VERSION
index 26d1beb6fe..d60e7aef29 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2-beta-152
+2.2-beta-157
diff --git a/doc/scripting/index.rst b/doc/scripting/index.rst
index 749fae6457..c6b479a7af 100644
--- a/doc/scripting/index.rst
+++ b/doc/scripting/index.rst
@@ -214,7 +214,7 @@ take a look at a simple script, stored as
 ``connection_record_01.bro``, that will output the connection record
 for a single connection.
 
-.. btest-include:: ${DOC_ROOT}/scripting/connection_record_02.bro
+.. btest-include:: ${DOC_ROOT}/scripting/connection_record_01.bro
 
 Again, we start with ``@load``, this time importing the
 :doc:`/scripts/base/protocols/conn/index` scripts which supply the tracking
diff --git a/scripts/base/frameworks/input/readers/sqlite.bro b/scripts/base/frameworks/input/readers/sqlite.bro
index 2cd025e7d4..27fc8fbf6a 100644
--- a/scripts/base/frameworks/input/readers/sqlite.bro
+++ b/scripts/base/frameworks/input/readers/sqlite.bro
@@ -1,6 +1,12 @@
-##! Interface for the SQLite input reader.
+##! Interface for the SQLite input reader. Redefinable options are available
+##! to tweak the input format of the SQLite reader.
 ##!
-##! The defaults are set to match Bro's ASCII output.
+##! See :doc:`/frameworks/logging-input-sqlite` for an introduction on how to
+##! use the SQLite reader.
+##!
+##! When using the SQLite reader, you have to specify the SQL query that returns
+##! the desired data by setting ``query`` in the ``config`` table. See the
+##! introduction mentioned above for an example.
 
 module InputSQLite;
 
diff --git a/scripts/base/frameworks/logging/writers/sqlite.bro b/scripts/base/frameworks/logging/writers/sqlite.bro
index 5df5e356c8..d73e95ac0a 100644
--- a/scripts/base/frameworks/logging/writers/sqlite.bro
+++ b/scripts/base/frameworks/logging/writers/sqlite.bro
@@ -1,5 +1,13 @@
-##! Interface for the SQLite log writer.  Redefinable options are available
+##! Interface for the SQLite log writer. Redefinable options are available
 ##! to tweak the output format of the SQLite reader.
+##!
+##! See :doc:`/frameworks/logging-input-sqlite` for an introduction on how to
+##! use the SQLite log writer.
+##!
+##! The SQL writer currently supports one writer-specific filter option via
+##! ``config``: setting ``tablename`` sets the name of the table that is used
+##! or created in the SQLite database. An example for this is given in the
+##! introduction mentioned above.
 
 module LogSQLite;