diff --git a/Changelog b/Changelog
index b884fe23..ffee79bd 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,7 @@
 Changelog for Percona Toolkit
 
+v2.0.4 released 2012-03-07
+
   * Added --filter to pt-kill to allow arbitrary --group-by
   * Added --[no]stalk to pt-stalk (bug 932331)
   * Added --execute to pt-online-schema-change (bug 933232)
diff --git a/Makefile.PL b/Makefile.PL
index 5aa8a35e..f87b74bc 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -2,7 +2,7 @@ use ExtUtils::MakeMaker;
 
 WriteMakefile(
     NAME      => 'percona-toolkit',
-    VERSION   => '2.0.3',
+    VERSION   => '2.0.4',
     EXE_FILES => [ <bin/*> ],
     MAN1PODS  => {
       'docs/percona-toolkit.pod' => 'blib/man1/percona-toolkit.1',
diff --git a/bin/pt-align b/bin/pt-align
index baa5d221..52c4c1a9 100755
--- a/bin/pt-align
+++ b/bin/pt-align
@@ -218,6 +218,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-align 2.0.3
+pt-align 2.0.4
 
 =cut
diff --git a/bin/pt-archiver b/bin/pt-archiver
index 939f3ecb..d06d93b4 100755
--- a/bin/pt-archiver
+++ b/bin/pt-archiver
@@ -5726,6 +5726,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-archiver 2.0.3
+pt-archiver 2.0.4
 
 =cut
diff --git a/bin/pt-config-diff b/bin/pt-config-diff
index e8ae782b..1dd70408 100755
--- a/bin/pt-config-diff
+++ b/bin/pt-config-diff
@@ -3405,6 +3405,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-config-diff 2.0.3
+pt-config-diff 2.0.4
 
 =cut
diff --git a/bin/pt-deadlock-logger b/bin/pt-deadlock-logger
index 09e6d345..0b8cc207 100755
--- a/bin/pt-deadlock-logger
+++ b/bin/pt-deadlock-logger
@@ -2740,6 +2740,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-deadlock-logger 2.0.3
+pt-deadlock-logger 2.0.4
 
 =cut
diff --git a/bin/pt-diskstats b/bin/pt-diskstats
index fda531be..8309ee2f 100755
--- a/bin/pt-diskstats
+++ b/bin/pt-diskstats
@@ -4109,6 +4109,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-diskstats 2.0.3
+pt-diskstats 2.0.4
 
 =cut
diff --git a/bin/pt-duplicate-key-checker b/bin/pt-duplicate-key-checker
index cce2ed81..e072295f 100755
--- a/bin/pt-duplicate-key-checker
+++ b/bin/pt-duplicate-key-checker
@@ -4274,6 +4274,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-duplicate-key-checker 2.0.3
+pt-duplicate-key-checker 2.0.4
 
 =cut
diff --git a/bin/pt-fifo-split b/bin/pt-fifo-split
index 72ca1439..ea25a101 100755
--- a/bin/pt-fifo-split
+++ b/bin/pt-fifo-split
@@ -1547,6 +1547,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-fifo-split 2.0.3
+pt-fifo-split 2.0.4
 
 =cut
diff --git a/bin/pt-find b/bin/pt-find
index a371be92..032ac206 100755
--- a/bin/pt-find
+++ b/bin/pt-find
@@ -3822,6 +3822,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-find 2.0.3
+pt-find 2.0.4
 
 =cut
diff --git a/bin/pt-fk-error-logger b/bin/pt-fk-error-logger
index 843a3a07..cf19db76 100755
--- a/bin/pt-fk-error-logger
+++ b/bin/pt-fk-error-logger
@@ -2460,6 +2460,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-fk-error-logger 2.0.3
+pt-fk-error-logger 2.0.4
 
 =cut
diff --git a/bin/pt-heartbeat b/bin/pt-heartbeat
index 87221a07..a96a7a06 100755
--- a/bin/pt-heartbeat
+++ b/bin/pt-heartbeat
@@ -4395,6 +4395,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-heartbeat 2.0.3
+pt-heartbeat 2.0.4
 
 =cut
diff --git a/bin/pt-index-usage b/bin/pt-index-usage
index a2b1191a..39d56bd6 100755
--- a/bin/pt-index-usage
+++ b/bin/pt-index-usage
@@ -6186,6 +6186,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-index-usage 2.0.3
+pt-index-usage 2.0.4
 
 =cut
diff --git a/bin/pt-ioprofile b/bin/pt-ioprofile
index c04a4b0c..bc9d6970 100755
--- a/bin/pt-ioprofile
+++ b/bin/pt-ioprofile
@@ -1037,7 +1037,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-ioprofile 2.0.3
+pt-ioprofile 2.0.4
 
 =cut
 
diff --git a/bin/pt-kill b/bin/pt-kill
index c5b06d11..f6e7b9f2 100755
--- a/bin/pt-kill
+++ b/bin/pt-kill
@@ -4857,6 +4857,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-kill 2.0.3
+pt-kill 2.0.4
 
 =cut
diff --git a/bin/pt-log-player b/bin/pt-log-player
index 0764b806..bfb990d8 100755
--- a/bin/pt-log-player
+++ b/bin/pt-log-player
@@ -3604,6 +3604,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-log-player 2.0.3
+pt-log-player 2.0.4
 
 =cut
diff --git a/bin/pt-mext b/bin/pt-mext
index a1153980..8207fa68 100755
--- a/bin/pt-mext
+++ b/bin/pt-mext
@@ -279,7 +279,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-mext 2.0.3
+pt-mext 2.0.4
 
 =cut
 
diff --git a/bin/pt-mysql-summary b/bin/pt-mysql-summary
index 25bc9ada..49bf573b 100755
--- a/bin/pt-mysql-summary
+++ b/bin/pt-mysql-summary
@@ -1486,7 +1486,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-mysql-summary 2.0.3
+pt-mysql-summary 2.0.4
 
 =cut
 
diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change
index d213dacd..64e9d73f 100755
--- a/bin/pt-online-schema-change
+++ b/bin/pt-online-schema-change
@@ -5120,6 +5120,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-online-schema-change 2.0.3
+pt-online-schema-change 2.0.4
 
 =cut
diff --git a/bin/pt-pmp b/bin/pt-pmp
index e04827c0..e4c0aa8d 100755
--- a/bin/pt-pmp
+++ b/bin/pt-pmp
@@ -390,7 +390,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-pmp 2.0.3
+pt-pmp 2.0.4
 
 =cut
 
diff --git a/bin/pt-query-advisor b/bin/pt-query-advisor
index efcb0f12..5044f328 100755
--- a/bin/pt-query-advisor
+++ b/bin/pt-query-advisor
@@ -7293,6 +7293,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-query-advisor 2.0.3
+pt-query-advisor 2.0.4
 
 =cut
diff --git a/bin/pt-query-digest b/bin/pt-query-digest
index 5b806d75..af0c34ba 100755
--- a/bin/pt-query-digest
+++ b/bin/pt-query-digest
@@ -15726,6 +15726,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-query-digest 2.0.3
+pt-query-digest 2.0.4
 
 =cut
diff --git a/bin/pt-show-grants b/bin/pt-show-grants
index 6f1e0f0d..f9171461 100755
--- a/bin/pt-show-grants
+++ b/bin/pt-show-grants
@@ -2227,6 +2227,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-show-grants 2.0.3
+pt-show-grants 2.0.4
 
 =cut
diff --git a/bin/pt-sift b/bin/pt-sift
index 4f56bdf0..31b8c4cb 100755
--- a/bin/pt-sift
+++ b/bin/pt-sift
@@ -726,7 +726,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-sift 2.0.3
+pt-sift 2.0.4
 
 =cut
 
diff --git a/bin/pt-slave-delay b/bin/pt-slave-delay
index c78cf723..547765fa 100755
--- a/bin/pt-slave-delay
+++ b/bin/pt-slave-delay
@@ -2713,6 +2713,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-slave-delay 2.0.3
+pt-slave-delay 2.0.4
 
 =cut
diff --git a/bin/pt-slave-find b/bin/pt-slave-find
index 4605e846..020f79e2 100755
--- a/bin/pt-slave-find
+++ b/bin/pt-slave-find
@@ -3279,6 +3279,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-slave-find 2.0.3
+pt-slave-find 2.0.4
 
 =cut
diff --git a/bin/pt-slave-restart b/bin/pt-slave-restart
index 0b960f9a..2ab02fdd 100755
--- a/bin/pt-slave-restart
+++ b/bin/pt-slave-restart
@@ -3450,6 +3450,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-slave-restart 2.0.3
+pt-slave-restart 2.0.4
 
 =cut
diff --git a/bin/pt-stalk b/bin/pt-stalk
index 81fb387b..7b1a3597 100755
--- a/bin/pt-stalk
+++ b/bin/pt-stalk
@@ -1720,7 +1720,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-stalk 2.0.3
+pt-stalk 2.0.4
 
 =cut
 
diff --git a/bin/pt-summary b/bin/pt-summary
index 8adba47d..b4bfd9b3 100755
--- a/bin/pt-summary
+++ b/bin/pt-summary
@@ -1376,7 +1376,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-summary 2.0.3
+pt-summary 2.0.4
 
 =cut
 
diff --git a/bin/pt-table-checksum b/bin/pt-table-checksum
index 9314a959..10ecd7ad 100755
--- a/bin/pt-table-checksum
+++ b/bin/pt-table-checksum
@@ -8466,6 +8466,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-table-checksum 2.0.3
+pt-table-checksum 2.0.4
 
 =cut
diff --git a/bin/pt-table-sync b/bin/pt-table-sync
index 57c1162e..1168c68b 100755
--- a/bin/pt-table-sync
+++ b/bin/pt-table-sync
@@ -10306,6 +10306,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-table-sync 2.0.3
+pt-table-sync 2.0.4
 
 =cut
diff --git a/bin/pt-tcp-model b/bin/pt-tcp-model
index 7cf92cf7..64ee3297 100755
--- a/bin/pt-tcp-model
+++ b/bin/pt-tcp-model
@@ -2412,6 +2412,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-tcp-model 2.0.3
+pt-tcp-model 2.0.4
 
 =cut
diff --git a/bin/pt-trend b/bin/pt-trend
index 810fa0ce..796e88eb 100755
--- a/bin/pt-trend
+++ b/bin/pt-trend
@@ -2098,6 +2098,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-trend 2.0.3
+pt-trend 2.0.4
 
 =cut
diff --git a/bin/pt-upgrade b/bin/pt-upgrade
index 65838c78..ad341a62 100755
--- a/bin/pt-upgrade
+++ b/bin/pt-upgrade
@@ -11884,6 +11884,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-upgrade 2.0.3
+pt-upgrade 2.0.4
 
 =cut
diff --git a/bin/pt-variable-advisor b/bin/pt-variable-advisor
index 3b753d9c..de563d92 100755
--- a/bin/pt-variable-advisor
+++ b/bin/pt-variable-advisor
@@ -3900,6 +3900,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-variable-advisor 2.0.3
+pt-variable-advisor 2.0.4
 
 =cut
diff --git a/bin/pt-visual-explain b/bin/pt-visual-explain
index cd5be91a..e1ae00f0 100755
--- a/bin/pt-visual-explain
+++ b/bin/pt-visual-explain
@@ -3095,6 +3095,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-visual-explain 2.0.3
+pt-visual-explain 2.0.4
 
 =cut
diff --git a/config/deb/changelog b/config/deb/changelog
index 44a626e0..935eb82b 100644
--- a/config/deb/changelog
+++ b/config/deb/changelog
@@ -1,3 +1,34 @@
+percona-toolkit (2.0.4) unstable; urgency=low
+
+  * Added --filter to pt-kill to allow arbitrary --group-by
+  * Added --[no]stalk to pt-stalk (bug 932331)
+  * Added --execute to pt-online-schema-change (bug 933232)
+  * Fixed bug 873598: pt-online-schema-change doesn't like reserved words in column names
+  * Fixed bug 928966: pt-pmp still uses insecure /tmp
+  * Fixed bug 933232: pt-online-schema-change can break replication
+  * Fixed bug 941225: Use of qw(...) as parentheses is deprecated at pt-kill line 3511
+  * Fixed bug 821694: pt-query-digest doesn't recognize hex InnoDB txn IDs
+  * Fixed bug 894255: pt-kill shouldn't check if STDIN is a tty when --daemonize is given
+  * Fixed bug 916999: pt-table-checksum error: DBD::mysql::st execute failed: called with 2 bind variables when 6 are needed
+  * Fixed bug 926598: DBD::mysql bug causes pt-upgrade to use wrong precision (M) and scale (D)
+  * Fixed bug 928226: pt-diskstats illegal division by zero
+  * Fixed bug 928415: Typo in pt-stalk doc: --trigger should be --function
+  * Fixed bug 930317: pt-archiver doc refers to nonexistent pt-query-profiler
+  * Fixed bug 930533: pt-sift looking for *-processlist1; broken compatibility with pt-stalk
+  * Fixed bug 932331: pt-stalk cannot collect without stalking
+  * Fixed bug 932442: pt-table-checksum error when column name has two spaces
+  * Fixed bug 932883: File Debian bug after each release
+  * Fixed bug 940503: pt-stalk disk space checks wrong on 32bit platforms
+  * Fixed bug 944420: --daemonize doesn't always close STDIN
+  * Fixed bug 945834: pt-sift invokes pt-diskstats with deprecated argument
+  * Fixed bug 945836: pt-sift prints awk error if there are no stack traces to aggregate
+  * Fixed bug 945842: pt-sift generates wrong state sum during processlist analysis
+  * Fixed bug 946438: pt-query-digest should print a better message when an unsupported log format is specified
+  * Fixed bug 946776: pt-table-checksum ignores --lock-wait-timeout
+  * Fixed bug 940440: Bad grammar in pt-kill docs
+
+ -- Percona Toolkit Developers <toolkit-dev@percona.com>  Wed, 07 Mar 2012 23:38:27 +0000
+
 percona-toolkit (2.0.3) unstable; urgency=low
 
   * Completely redesigned pt-diskstats
diff --git a/config/sphinx-build/conf.py b/config/sphinx-build/conf.py
index 4ee7f3c0..224a7f7c 100644
--- a/config/sphinx-build/conf.py
+++ b/config/sphinx-build/conf.py
@@ -50,7 +50,7 @@ copyright = u'2011, Percona Inc'
 # The short X.Y version.
 version = '2.0'
 # The full version, including alpha/beta/rc tags.
-release = '2.0.3'
+release = '2.0.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/percona-toolkit.pod b/docs/percona-toolkit.pod
index e4f258cc..0c366698 100644
--- a/docs/percona-toolkit.pod
+++ b/docs/percona-toolkit.pod
@@ -488,6 +488,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-Percona Toolkit v2.0.3 released 2012-02-03
+Percona Toolkit v2.0.4 released 2012-03-07
 
 =cut
diff --git a/docs/release_notes.rst b/docs/release_notes.rst
index ff589dba..9c473a0e 100644
--- a/docs/release_notes.rst
+++ b/docs/release_notes.rst
@@ -1,6 +1,51 @@
 Release Notes
 *************
 
+v2.0.4 released 2012-03-07
+==========================
+
+Percona Toolkit 2.0.4 has been released.  23 bugs were fixed in this release,
+and three new features were implemented.  First, --filter was added to pt-kill
+which allows for arbitrary --group-by.  Second, pt-online-schema-change now
+requires that its new --execute option be given, else the tool will just check
+the tables and exit.  This is a safeguard to encourage users to read the
+documentation, particularly when replication is involved.  Third, pt-stalk
+also received a new option: --[no]stalk.  To collect immediately without
+stalking, specify --no-stalk and the tool will collect once and exit.
+
+This release is completely backwards compatible with previous 2.0 releases.
+Given the number of bug fixes, it's worth upgrading to 2.0.4.
+
+Changelog
+---------
+
+* Added --filter to pt-kill to allow arbitrary --group-by
+* Added --[no]stalk to pt-stalk (bug 932331)
+* Added --execute to pt-online-schema-change (bug 933232)
+* Fixed bug 873598: pt-online-schema-change doesn't like reserved words in column names
+* Fixed bug 928966: pt-pmp still uses insecure /tmp
+* Fixed bug 933232: pt-online-schema-change can break replication
+* Fixed bug 941225: Use of qw(...) as parentheses is deprecated at pt-kill line 3511
+* Fixed bug 821694: pt-query-digest doesn't recognize hex InnoDB txn IDs
+* Fixed bug 894255: pt-kill shouldn't check if STDIN is a tty when --daemonize is given
+* Fixed bug 916999: pt-table-checksum error: DBD::mysql::st execute failed: called with 2 bind variables when 6 are needed
+* Fixed bug 926598: DBD::mysql bug causes pt-upgrade to use wrong precision (M) and scale (D)
+* Fixed bug 928226: pt-diskstats illegal division by zero
+* Fixed bug 928415: Typo in pt-stalk doc: --trigger should be --function
+* Fixed bug 930317: pt-archiver doc refers to nonexistent pt-query-profiler
+* Fixed bug 930533: pt-sift looking for *-processlist1; broken compatibility with pt-stalk
+* Fixed bug 932331: pt-stalk cannot collect without stalking
+* Fixed bug 932442: pt-table-checksum error when column name has two spaces
+* Fixed bug 932883: File Debian bug after each release
+* Fixed bug 940503: pt-stalk disk space checks wrong on 32bit platforms
+* Fixed bug 944420: --daemonize doesn't always close STDIN
+* Fixed bug 945834: pt-sift invokes pt-diskstats with deprecated argument
+* Fixed bug 945836: pt-sift prints awk error if there are no stack traces to aggregate
+* Fixed bug 945842: pt-sift generates wrong state sum during processlist analysis
+* Fixed bug 946438: pt-query-digest should print a better message when an unsupported log format is specified
+* Fixed bug 946776: pt-table-checksum ignores --lock-wait-timeout
+* Fixed bug 940440: Bad grammar in pt-kill docs
+
 v2.0.3 released 2012-02-03
 ==========================