diff --git a/ORGWEBPAGE/index.org b/ORGWEBPAGE/index.org
index 5501ca029..919295215 100644
--- a/ORGWEBPAGE/index.org
+++ b/ORGWEBPAGE/index.org
@@ -54,9 +54,9 @@ a look at our [[http://orgmode.org/worg/org-quotes.php][collected quotes about O
 - <2009-01-21 Wed>: Release 6.18c
 - <2009-01-20 Tue>: Release 6.18
 
-* Current Version (6.20i)
+* Current Version (6.21)
 
-The current version is 6.20i.  To see what has changed in recent
+The current version is 6.21.  To see what has changed in recent
 releases, check this detailed list of [[file:Changes.html][user-visible changes]].
 
 This package works on Emacs 23 and 22, and (with minor restrictions)
@@ -69,7 +69,7 @@ a bit behind the website release.
 
 ** The standard distribution
 
-Download as [[file:org-6.20i.zip][zip file]] or [[file:org-6.20i.tar.gz][gzipped tar archive]].  These archives contain
+Download as [[file:org-6.21.zip][zip file]] or [[file:org-6.21.tar.gz][gzipped tar archive]].  These archives contain
 both the Lisp file org.el and the documentation in PDF and (TeX)Info
 formats.  Follow the instructions for [[http://orgmode.org/manual/Installation.html#Installation][Installation]] and [[http://orgmode.org/manual/Activation.html#Activation][Activation]].
 
diff --git a/README_DIST b/README_DIST
index 1bc335a3f..29658082d 100644
--- a/README_DIST
+++ b/README_DIST
@@ -1,7 +1,7 @@
 The is a distribution of Org, a plain text notes and project planning
 tool for Emacs.
 
-The version of this release is: 6.20i
+The version of this release is: 6.21
 
 The homepage of Org is at http://orgmode.org
 
diff --git a/doc/org.texi b/doc/org.texi
index 5430db667..1ad1f4066 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -3,7 +3,7 @@
 @setfilename ../../info/org
 @settitle The Org Manual
 
-@set VERSION 6.20i
+@set VERSION 6.21
 @set DATE February 2009
 
 @dircategory Emacs
diff --git a/doc/orgcard.tex b/doc/orgcard.tex
index 9cc642547..ef141e8b0 100644
--- a/doc/orgcard.tex
+++ b/doc/orgcard.tex
@@ -1,5 +1,5 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{6.20i}
+\def\orgversionnumber{6.21}
 \def\versionyear{2009}          % latest update
 \def\year{2009}                 % latest copyright year
 
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 4b23abac4..746ca5c5e 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.20i
+;; Version: 6.21
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-archive.el b/lisp/org-archive.el
index 7234546a0..58105f714 100644
--- a/lisp/org-archive.el
+++ b/lisp/org-archive.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.20i
+;; Version: 6.21
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-attach.el b/lisp/org-attach.el
index 0eba8d1b0..2f66b2272 100644
--- a/lisp/org-attach.el
+++ b/lisp/org-attach.el
@@ -4,7 +4,7 @@
 
 ;; Author: John Wiegley <johnw@newartisans.com>
 ;; Keywords: org data task
-;; Version: 6.20i
+;; Version: 6.21
 
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-bbdb.el b/lisp/org-bbdb.el
index 986b1783b..ccd83e733 100644
--- a/lisp/org-bbdb.el
+++ b/lisp/org-bbdb.el
@@ -7,7 +7,7 @@
 ;;         Thomas Baumann <thomas dot baumann at ch dot tum dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.20i
+;; Version: 6.21
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-bibtex.el b/lisp/org-bibtex.el
index 3cd5d8cd9..a0f6b0c00 100644
--- a/lisp/org-bibtex.el
+++ b/lisp/org-bibtex.el
@@ -5,7 +5,7 @@
 ;; Author: Bastien Guerry <bzg at altern dot org>
 ;;         Carsten Dominik <carsten dot dominik at gmail dot com>
 ;; Keywords: org, wp, remember
-;; Version: 6.20i
+;; Version: 6.21
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 43d02a56a..83ec1cdec 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.20i
+;; Version: 6.21
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-colview-xemacs.el b/lisp/org-colview-xemacs.el
index 57ccd64e3..cfc9cc315 100644
--- a/lisp/org-colview-xemacs.el
+++ b/lisp/org-colview-xemacs.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.20i
+;; Version: 6.21
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-colview.el b/lisp/org-colview.el
index 790f19240..4c921cd0b 100644
--- a/lisp/org-colview.el
+++ b/lisp/org-colview.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.20i
+;; Version: 6.21
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index a2be737ca..a32fd3305 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.20i
+;; Version: 6.21
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index da6ffbd14..564d7655f 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.20i
+;; Version: 6.21
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-export-latex.el b/lisp/org-export-latex.el
index 02aa4c05d..d3bc6b13a 100644
--- a/lisp/org-export-latex.el
+++ b/lisp/org-export-latex.el
@@ -4,7 +4,7 @@
 ;;
 ;; Emacs Lisp Archive Entry
 ;; Filename: org-export-latex.el
-;; Version: 6.20i
+;; Version: 6.21
 ;; Author: Bastien Guerry <bzg AT altern DOT org>
 ;; Maintainer: Bastien Guerry <bzg AT altern DOT org>
 ;; Keywords: org, wp, tex
diff --git a/lisp/org-faces.el b/lisp/org-faces.el
index b31f6ead1..3ac034f8b 100644
--- a/lisp/org-faces.el
+++ b/lisp/org-faces.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.20i
+;; Version: 6.21
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-footnote.el b/lisp/org-footnote.el
index b9e8bb561..dfe911d97 100644
--- a/lisp/org-footnote.el
+++ b/lisp/org-footnote.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.20i
+;; Version: 6.21
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-gnus.el b/lisp/org-gnus.el
index 682dbc83f..e1d8190e7 100644
--- a/lisp/org-gnus.el
+++ b/lisp/org-gnus.el
@@ -7,7 +7,7 @@
 ;;         Tassilo Horn <tassilo at member dot fsf dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.20i
+;; Version: 6.21
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-id.el b/lisp/org-id.el
index 705f8ce6e..96a6f54d5 100644
--- a/lisp/org-id.el
+++ b/lisp/org-id.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.20i
+;; Version: 6.21
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-info.el b/lisp/org-info.el
index 78f5cb68e..fc83ef588 100644
--- a/lisp/org-info.el
+++ b/lisp/org-info.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.20i
+;; Version: 6.21
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-irc.el b/lisp/org-irc.el
index a7f858d72..7fcdebeda 100644
--- a/lisp/org-irc.el
+++ b/lisp/org-irc.el
@@ -4,7 +4,7 @@
 ;;
 ;; Author: Philip Jackson <emacs@shellarchive.co.uk>
 ;; Keywords: erc, irc, link, org
-;; Version: 6.20i
+;; Version: 6.21
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-jsinfo.el b/lisp/org-jsinfo.el
index 5c9993a33..cf077c1c0 100644
--- a/lisp/org-jsinfo.el
+++ b/lisp/org-jsinfo.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.20i
+;; Version: 6.21
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-list.el b/lisp/org-list.el
index a04afd5bf..acc3400ef 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -7,7 +7,7 @@
 ;;	   Bastien Guerry <bzg AT altern DOT org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.20i
+;; Version: 6.21
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-mac-message.el b/lisp/org-mac-message.el
index 56902f673..097e1b292 100644
--- a/lisp/org-mac-message.el
+++ b/lisp/org-mac-message.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2008, 2009 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
-;; Version: 6.20i
+;; Version: 6.21
 ;; Keywords: outlines, hypermedia, calendar, wp
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index c6ef6354c..ea9a6fc88 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.20i
+;; Version: 6.21
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-mew.el b/lisp/org-mew.el
index 02b9a4772..beb70b08c 100644
--- a/lisp/org-mew.el
+++ b/lisp/org-mew.el
@@ -5,7 +5,7 @@
 ;; Author: Tokuya Kameshima <kames at fa2 dot so-net dot ne dot jp>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.20i
+;; Version: 6.21
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/org-mhe.el b/lisp/org-mhe.el
index af9be4b95..b98b4b59f 100644
--- a/lisp/org-mhe.el
+++ b/lisp/org-mhe.el
@@ -6,7 +6,7 @@
 ;; Author: Thomas Baumann <thomas dot baumann at ch dot tum dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.20i
+;; Version: 6.21
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-mouse.el b/lisp/org-mouse.el
index 62868342b..0a8562214 100644
--- a/lisp/org-mouse.el
+++ b/lisp/org-mouse.el
@@ -4,7 +4,7 @@
 ;;
 ;; Author: Piotr Zielinski <piotr dot zielinski at gmail dot com>
 ;; Maintainer: Carsten Dominik <carsten at orgmode dot org>
-;; Version: 6.20i
+;; Version: 6.21
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-plot.el b/lisp/org-plot.el
index 83d650226..3f0dd12f5 100644
--- a/lisp/org-plot.el
+++ b/lisp/org-plot.el
@@ -5,7 +5,7 @@
 ;; Author: Eric Schulte <schulte dot eric at gmail dot com>
 ;; Keywords: tables, plotting
 ;; Homepage: http://orgmode.org
-;; Version: 6.20i
+;; Version: 6.21
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-publish.el b/lisp/org-publish.el
index efbfd219b..4da6ea8d9 100644
--- a/lisp/org-publish.el
+++ b/lisp/org-publish.el
@@ -4,7 +4,7 @@
 ;; Author: David O'Toole <dto@gnu.org>
 ;; Maintainer: Bastien Guerry <bzg AT altern DOT org>
 ;; Keywords: hypermedia, outlines, wp
-;; Version: 6.20i
+;; Version: 6.21
 
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-remember.el b/lisp/org-remember.el
index 25ab17b24..fe52a2d6c 100644
--- a/lisp/org-remember.el
+++ b/lisp/org-remember.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.20i
+;; Version: 6.21
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-rmail.el b/lisp/org-rmail.el
index 852e9684e..1707434b1 100644
--- a/lisp/org-rmail.el
+++ b/lisp/org-rmail.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.20i
+;; Version: 6.21
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 79ab3a5ef..802874b52 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.20i
+;; Version: 6.21
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-timer.el b/lisp/org-timer.el
index 1e0764d8e..86477a0ed 100644
--- a/lisp/org-timer.el
+++ b/lisp/org-timer.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.20i
+;; Version: 6.21
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-vm.el b/lisp/org-vm.el
index 8b4a22030..4d221587a 100644
--- a/lisp/org-vm.el
+++ b/lisp/org-vm.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.20i
+;; Version: 6.21
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-w3m.el b/lisp/org-w3m.el
index e5f7405b7..c700e5001 100644
--- a/lisp/org-w3m.el
+++ b/lisp/org-w3m.el
@@ -5,7 +5,7 @@
 ;; Author: Andy Stewart <lazycat dot manatee at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.20i
+;; Version: 6.21
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-wl.el b/lisp/org-wl.el
index ad4b9f9b5..bc2d40341 100644
--- a/lisp/org-wl.el
+++ b/lisp/org-wl.el
@@ -6,7 +6,7 @@
 ;; Author: Tokuya Kameshima <kames at fa2 dot so-net dot ne dot jp>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.20i
+;; Version: 6.21
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org.el b/lisp/org.el
index 1a7ced09c..e00383d9b 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.20i
+;; Version: 6.21
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -94,7 +94,7 @@
 
 ;;; Version
 
-(defconst org-version "6.20i"
+(defconst org-version "6.21"
   "The version number of the file org.el.")
 
 (defun org-version (&optional here)