diff --git a/CHANGELOG b/CHANGELOG
index 825071a20dfb10c374628a7bb69f05b0c6772c88..3537893098ed35af2902fa10cc68013228963122 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,19 @@
+2015-11-23 version 1.2
+======================
+Replace shell scripts with python scripts
+Replace inithost and removehost shell scripts with Python scripts
+Ignore pyc files
+Dynamic Jiffybox inventory
+Move dynamic inventory scripts to a central place
+Fine tune inithost and removehost playbooks with the cloud as an option
+Change location of plugins during runtime
+Update documentation
+Optimize initial setup by using submodules
+Exclude localhost from initial provisioning
+Documentation about boto when using AWS inventory
+AWS provisioning
+Support drush commands during deploy
+
 2015-11-16 version 1.1
 ======================
 Enhance deploy playbook