diff --git a/CHANGELOG b/CHANGELOG
index 31b821fc..8a8548d1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,27 @@
-## 2.00.1
+## 2.1.0
+
+- if apps are accidentally deleted there is copy left in deposit folder
+- db.table.field.epoch() counts seconds from epoch
+- fixed many aith.wiki problems
+- better welcome layout, thanks Paolo
+- db.define_table(...,redefine=True)
+- DAL, Row, and Rows object can now be pickled/unpickled, thanks to zombie DAL.
+- admin uses codemirror
+- support for auth.wiki(render='html')
+- upgraded jQuery 1.8
+- upgraded Bootstrap 2.1
+- fixed problem with dropbox_account.py
+- cache.with_prefix(cache.ram,'prefix')
+- mail.send(...,sender='Mr X <%(sender)s>')
+- allow entropy computation in IS_STRONG and web2py.js, thanks Jonathan and Niphlod
+- renamed luon/contrib/comet_messaging.py -> gluon/contrib/websocket_messaging.py
+- DAL support for SQL CASE, example: db().select(...query.case('true','false))
+- faster web2py_uuid() and request initialization logic, thanks Michele
+- static asset management, thanks Niphlod
+- improved mobile admin
+- request.requires_https and Auth(secure=True), thanks Yarin and Niphlod
+
+## 2.0.1-11
 
 ### DAL Improvements
 
diff --git a/Makefile b/Makefile
index 3193225d..dccf6874 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.0.9 ('`date +%Y-%m-%d\ %H:%M:%S`') dev' > VERSION
+	echo 'Version 2.1.0rc1 ('`date +%Y-%m-%d\ %H:%M:%S`') dev' > VERSION
 	### rm -f all junk files
 	make clean
 	### clean up baisc apps
diff --git a/VERSION b/VERSION
index daf39b00..b34fd84c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.0.9 (2012-10-07 13:30:56) dev
+Version 2.1.0rc1 (2012-10-07 22:45:34) dev