diff --git a/configure.ac b/configure.ac
index c42fa0b..278493c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 
-AC_INIT([xtables-addons], [1.20])
+AC_INIT([xtables-addons], [1.21])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_INSTALL
diff --git a/doc/changelog.txt b/doc/changelog.txt
index f7191ee..d35a279 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -3,6 +3,12 @@ HEAD
 ====
 
 
+Xtables-addons 1.21 (December 09 2009)
+======================================
+- ACCOUNT: avoid collision with arp_tables setsockopt numbers
+- doc: fix option mismatch --gw/--gateway in libxt_TEE.man
+
+
 Xtables-addons 1.20 (November 19 2009)
 ======================================
 - ipp2p: add more boundary checks
diff --git a/xtables-addons.8.in b/xtables-addons.8.in
index 0dc63cf..bcc4683 100644
--- a/xtables-addons.8.in
+++ b/xtables-addons.8.in
@@ -1,4 +1,4 @@
-.TH xtables-addons 8 "v1.20 (2009-11-19)" "" "v1.20 (2009-11-19)"
+.TH xtables-addons 8 "v1.21 (2009-12-09)" "" "v1.21 (2009-12-09)"
 .SH Name
 Xtables-addons \(em additional extensions for iptables, ip6tables, etc.
 .SH Targets