diff --git a/CREDITS b/CREDITS
index 78e707b8..99bb0e5a 100644
--- a/CREDITS
+++ b/CREDITS
@@ -10,3 +10,4 @@ Hannu Krosing <hannu@2ndQuadrant.com>
 Cédric Villemain <cedric@2ndquadrant.com>
 Charles Duffy <charles@dyfis.net>
 Daniel Farina <daniel@heroku.com>
+Marco Nenciarini <marco.nenciarini@2ndquadrant.it>
diff --git a/HISTORY b/HISTORY
index 8a5e8471..4d8a75eb 100644
--- a/HISTORY
+++ b/HISTORY
@@ -31,7 +31,12 @@
 1.1.0   2011-03-09
         Make options -U, -R and -p not mandatory (Jaime)
 
-1.1.1	2011-XX-XX
+1.1.1	2012-04-20
         Add --ignore-rsync-warning (Cédric)
         Add strnlen for compatibility with OS X (Greg)
         Improve performance of repl_status view (Jaime) 
+
+1.2.0	2012-04-28
+        Add CLUSTER SHOW command (Marco Nenciarini)
+        Add CLUSTER CLEANUP command (Jaime)
+        Add function write_primary_conninfo (Marco Nenciarini)