diff --git a/CHANGELOG b/CHANGELOG
index 2dcd127e..c94ab074 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,14 @@
+## 2.4.1
+
+- support for semantic versioning
+- new bootstrap based admin, thanks Paolo
+- graphiz support added to adm, thanks Jose
+- on_failure in grid
+- db.table.field.abs()
+- geoPoint, getLine, geoPolygon
+- better reporting of 500 ajax errors
+- bug fixes (including issues with calendar.js and archive tables)
+
 ## 2.3.1 - 2.3.2
 
 - new virtual fields syntax: 
diff --git a/VERSION b/VERSION
index 002e289d..299393e7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.4.1-alpha.1+timestamp.2012.12.24.13.54.21
+Version 2.4.1-alpha.1+timestamp.2012.12.24.14.03.22
diff --git a/web2py_src.zip b/web2py_src.zip
index c6d0cd6c..7eefd36a 100644
Binary files a/web2py_src.zip and b/web2py_src.zip differ
diff --git a/web2py_src_old.zip b/web2py_src_old.zip
index 9899f1cb..c6d0cd6c 100644
Binary files a/web2py_src_old.zip and b/web2py_src_old.zip differ