diff --git a/ChangeLog b/ChangeLog
index 05fbb75..89c124a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+nenolod     2007/01/25 06:40:21 UTC	(20070125-3143)
+  Log:
+  - the new plan:
+    + branches/release-2.1 -> 2.2 base
+    + 3.0 -> branches/cxxconversion
+    + backport some immediate 3.0 functionality for 2.2
+    + other stuff
+  
+
+  Changes:	Modified:
+  + -		trunk/ (File Added) 
+
+
 jilles      2007/01/23 23:48:50 UTC	(20070123-3139)
   Log:
   Merged revisions 3135,3137 via svnmerge from 
diff --git a/NEWS b/NEWS
index 9374992..a852f38 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
-This is charybdis 2.1.2, Copyright (c) 2005-2006 Charybdis team.
+This is charybdis 2.2.0, Copyright (c) 2005-2007 Charybdis team.
 See LICENSE for licensing details (GPL v2).
 
+-- charybdis-2.2.0
+
 -- charybdis-2.1.2
 
 - Fix bug that could cause all hostmangled users to be exempted when a
@@ -332,5 +334,5 @@ modules in case the developers need them.
 Other files recommended for reading: BUGS, README.FIRST, INSTALL
 
 --------------------------------------------------------------------------------
-$Id: NEWS 2813 2006-12-05 13:24:19Z jilles $
+$Id: NEWS 3145 2007-01-25 06:45:04Z nenolod $
 
diff --git a/configure.ac b/configure.ac
index 9e6cf72..a6b1d13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl $Id: configure.ac 2809 2006-12-05 13:18:19Z jilles $
+dnl $Id: configure.ac 3145 2007-01-25 06:45:04Z nenolod $
 dnl Process this file with autoconf to produce a configure script.
 
 dnl TODO: clean up all the OpenSSL and shared module checking stuff;
@@ -8,9 +8,9 @@ dnl said functions need to be just about as complex as they already are.
 AC_PREREQ(2.57)
 
 dnl Sneaky way to get an Id tag into the configure script
-AC_COPYRIGHT([$Id: configure.ac 2809 2006-12-05 13:18:19Z jilles $])
+AC_COPYRIGHT([$Id: configure.ac 3145 2007-01-25 06:45:04Z nenolod $])
 
-AC_INIT([charybdis],[2.1.2])
+AC_INIT([charybdis],[2.2.0])
 
 AC_CONFIG_HEADER(include/setup.h)
 
diff --git a/include/serno.h b/include/serno.h
index da83cab..cf6eb51 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070123-3139"
+#define SERNO "20070125-3143"