diff --git a/ChangeLog b/ChangeLog
index d7a5429..827b62a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-btrbk-current
+btrbk-0.21.0
 
   * Added transaction log (configuration option "transaction_log").
   * Added configuration option "group".
diff --git a/btrbk b/btrbk
index 7d717d5..6c7c434 100755
--- a/btrbk
+++ b/btrbk
@@ -48,7 +48,7 @@ use Getopt::Long qw(GetOptions);
 use POSIX qw(strftime);
 use Data::Dumper;
 
-our $VERSION       = "0.21.0-dev";
+our $VERSION       = "0.21.0";
 our $AUTHOR        = 'Axel Burri <axel@tty0.ch>';
 our $PROJECT_HOME  = '<http://www.digint.ch/btrbk/>';
 
diff --git a/doc/btrbk.1 b/doc/btrbk.1
index f1db2c6..7739dbe 100644
--- a/doc/btrbk.1
+++ b/doc/btrbk.1
@@ -1,4 +1,4 @@
-.TH "btrbk" "1" "2015-09-29" "btrbk v0.21.0-dev" ""
+.TH "btrbk" "1" "2015-10-25" "btrbk v0.21.0" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/doc/btrbk.conf.5 b/doc/btrbk.conf.5
index c072643..7ab0633 100644
--- a/doc/btrbk.conf.5
+++ b/doc/btrbk.conf.5
@@ -1,4 +1,4 @@
-.TH "btrbk.conf" "5" "2015-09-29" "btrbk v0.21.0-dev" ""
+.TH "btrbk.conf" "5" "2015-10-25" "btrbk v0.21.0" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/doc/ssh_filter_btrbk.1 b/doc/ssh_filter_btrbk.1
index 6ecd1bb..a6da6aa 100644
--- a/doc/ssh_filter_btrbk.1
+++ b/doc/ssh_filter_btrbk.1
@@ -1,4 +1,4 @@
-.TH "ssh_filter_btrbk" "1" "2015-09-03" "btrbk v0.20.0" ""
+.TH "ssh_filter_btrbk" "1" "2015-10-25" "btrbk v0.21.0" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)