diff --git a/ChangeLog b/ChangeLog
index 46462cb..ee09272 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Apr 18 23:36:08 2012  Olaf van der Spek <olafvdspek@gmail.com>
+
+        * ctemplate: version 2.2 release
+        * Fixed several issues reported by G++ 4.7
 
 Thu Mar 22 00:29:09 2012  Olaf van der Spek <olafvdspek@gmail.com>
 	
diff --git a/NEWS b/NEWS
index 726b70b..7a34e30 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+== 18 April 2012 ==
+
+Ctemplate 2.2 has been released. Several issues reported by G++ 4.7 have been fixed.
+
 == 22 March 2012 ==
 
 2.1 has been released. operator[] has been added to TemplateDictionary.
diff --git a/configure b/configure
index f0eeb3b..6ab06d1 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for ctemplate 2.1.
+# Generated by GNU Autoconf 2.67 for ctemplate 2.2.
 #
 # Report bugs to <google-ctemplate@googlegroups.com>.
 #
@@ -701,8 +701,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ctemplate'
 PACKAGE_TARNAME='ctemplate'
-PACKAGE_VERSION='2.1'
-PACKAGE_STRING='ctemplate 2.1'
+PACKAGE_VERSION='2.2'
+PACKAGE_STRING='ctemplate 2.2'
 PACKAGE_BUGREPORT='google-ctemplate@googlegroups.com'
 PACKAGE_URL=''
 
@@ -1454,7 +1454,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.1 to adapt to many kinds of systems.
+\`configure' configures ctemplate 2.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1524,7 +1524,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ctemplate 2.1:";;
+     short | recursive ) echo "Configuration of ctemplate 2.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1632,7 +1632,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ctemplate configure 2.1
+ctemplate configure 2.2
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2176,7 +2176,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.1, which was
+It was created by ctemplate $as_me 2.2, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2539,7 +2539,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:0:0
+SO_VERSION=2:1:0
 
 # The argument here is just something that should be in the current directory
 # (for sanity checking)
@@ -3083,7 +3083,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='ctemplate'
- VERSION='2.1'
+ VERSION='2.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16811,7 +16811,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.1, which was
+This file was extended by ctemplate $as_me 2.2, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16877,7 +16877,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.1
+ctemplate config.status 2.2
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 3495a06..d25a797 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,12 +4,12 @@
 # make sure we're interpreted by some minimal autoconf
 AC_PREREQ(2.57)
 
-AC_INIT(ctemplate, 2.1, google-ctemplate@googlegroups.com)
+AC_INIT(ctemplate, 2.2, 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:0:0
+SO_VERSION=2:1:0
 
 # The argument here is just something that should be in the current directory
 # (for sanity checking)