diff --git a/CHANGELOG b/CHANGELOG
index 16eae8ab..e2651cc0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,26 @@
+## 2.3.1
+
+- new virtual fields syntax: 
+  ``db.define_table('person',Field('name'),Field.Virtual('namey',lambda row: row.person.name+'y'))``
+- db.thing(name='Cohen',_orderby=db.thing.name), thanks Yair
+- made many modules Python 3.3 friendly (compile but not tested)
+- better welcome css, thanks Paolo
+- jQuery 1.8.2
+- better scheduler, thanks Niphlod
+- page and media preview in wiki, thanks Niphlod
+- create new auth.wiki page from slug model, thanks Nico
+- conditional menus with auth.wiki(menugroups=['wiki_editor'])
+- better security in grid/smartgrid
+- allow LOADing multiple grids, thanks Niphlod
+- auth.settings.login_onfail, thanks Yair
+- better handling of session files for speed
+- added heroku support (experimental)
+- added rocket support for IPV6, thanks Chirs Winebrinner
+- more customizable menus with MENU(li_first, li_last..)
+- added support for paymentech (gluon/contrib/paymentech.py)
+- fixed broken cron
+- many bug fixes. Closed more than 50 tickets since 2.2.1
+
 ## 2.2.1
 
 - session.connect(cookie_key='secret', compression_level=9) stores sessions in cookies
diff --git a/Makefile b/Makefile
index 95fafa4a..00df2d0b 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ update:
 	wget -O gluon/contrib/simplejsonrpc.py http://rad2py.googlecode.com/hg/ide2py/simplejsonrpc.py
 	echo "remember that pymysql was tweaked"
 src:
-	echo 'Version 2.3.0 ('`date +%Y-%m-%d\ %H:%M:%S`') rc1' > VERSION
+	echo 'Version 2.3.0 ('`date +%Y-%m-%d\ %H:%M:%S`') rc2' > VERSION
 	### rm -f all junk files
 	make clean
 	### clean up baisc apps
diff --git a/VERSION b/VERSION
index ba0aa062..8f3fc3b4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.3.0 (2012-12-13 11:28:10) rc1
+Version 2.3.0 (2012-12-13 11:52:42) rc2