diff --git a/trunk/ChangeLog b/trunk/ChangeLog
index ee09272..0b20f2f 100644
--- a/trunk/ChangeLog
+++ b/trunk/ChangeLog
@@ -1,3 +1,10 @@
+Wed Mar 19 20:02:51 2014  Olaf van der Spek <olafvdspek@gmail.com>
+
+	* ctemplate: version 2.3 release
+	* Fixed some more C++11 issues. 
+	* Removed deprecated Template::SetEscapedValueAndShowSection() 
+	*   and Template::ReloadIfChanged().
+
 Wed Apr 18 23:36:08 2012  Olaf van der Spek <olafvdspek@gmail.com>
 
         * ctemplate: version 2.2 release
diff --git a/trunk/NEWS b/trunk/NEWS
index 7a34e30..0c80b51 100644
--- a/trunk/NEWS
+++ b/trunk/NEWS
@@ -1,3 +1,8 @@
+== 19 March 2014 ==
+
+Ctemplate 2.3 has been released. Fixed some more C++11 issues. 
+Removed deprecated Template::SetEscapedValueAndShowSection() and Template::ReloadIfChanged().
+
 == 18 April 2012 ==
 
 Ctemplate 2.2 has been released. Several issues reported by G++ 4.7 have been fixed.
diff --git a/trunk/configure b/trunk/configure
index 9c0d752..976a6dc 100755
--- a/trunk/configure
+++ b/trunk/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ctemplate 2.2.
+# Generated by GNU Autoconf 2.69 for ctemplate 2.3.
 #
 # Report bugs to <google-ctemplate@googlegroups.com>.
 #
@@ -729,8 +729,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ctemplate'
 PACKAGE_TARNAME='ctemplate'
-PACKAGE_VERSION='2.2'
-PACKAGE_STRING='ctemplate 2.2'
+PACKAGE_VERSION='2.3'
+PACKAGE_STRING='ctemplate 2.3'
 PACKAGE_BUGREPORT='google-ctemplate@googlegroups.com'
 PACKAGE_URL=''
 
@@ -1483,7 +1483,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ctemplate 2.2 to adapt to many kinds of systems.
+\`configure' configures ctemplate 2.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1553,7 +1553,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ctemplate 2.2:";;
+     short | recursive ) echo "Configuration of ctemplate 2.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1661,7 +1661,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ctemplate configure 2.2
+ctemplate configure 2.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2205,7 +2205,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ctemplate $as_me 2.2, which was
+It was created by ctemplate $as_me 2.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2595,7 +2595,7 @@ AM_BACKSLASH='\'
 
 # Update this value for every release!  (A:B:C will map to foo.so.(A-C).C.B)
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-SO_VERSION=2:1:0
+SO_VERSION=3:0:0
 
 # The argument here is just something that should be in the current directory
 # (for sanity checking)
@@ -3139,7 +3139,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='ctemplate'
- VERSION='2.2'
+ VERSION='2.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16870,7 +16870,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ctemplate $as_me 2.2, which was
+This file was extended by ctemplate $as_me 2.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16936,7 +16936,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ctemplate config.status 2.2
+ctemplate config.status 2.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/trunk/configure.ac b/trunk/configure.ac
index d25a797..6682c31 100644
--- a/trunk/configure.ac
+++ b/trunk/configure.ac
@@ -4,12 +4,12 @@
 # make sure we're interpreted by some minimal autoconf
 AC_PREREQ(2.57)
 
-AC_INIT(ctemplate, 2.2, google-ctemplate@googlegroups.com)
+AC_INIT(ctemplate, 2.3, google-ctemplate@googlegroups.com)
 AM_SILENT_RULES([yes])
 
 # Update this value for every release!  (A:B:C will map to foo.so.(A-C).C.B)
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-SO_VERSION=2:1:0
+SO_VERSION=3:0:0
 
 # The argument here is just something that should be in the current directory
 # (for sanity checking)