diff --git a/ORGWEBPAGE/Changes.org b/ORGWEBPAGE/Changes.org
index fd1723ac7..e3a6e027b 100644
--- a/ORGWEBPAGE/Changes.org
+++ b/ORGWEBPAGE/Changes.org
@@ -130,6 +130,18 @@ LaTeX and HTML.  This is implemented in a contributed package by
 Taru Karttunen, /org-exp-bibtex.el/.  Kudos to Taru for this
 really nice addition.
 
+*** Finally a way to specify keywords and description for HTML export
+
+Use something like
+
+#+begin_src org
+#+DESCRIPTION: This page is all about ....
+#+KEYWORDS: org-mode, indexing, publishing
+#+end_src
+
+To specify the content of the description and keywords meta tags
+for HTML output.
+
 *** org-collector.el is now a contributed package
 
 /org-collector.el/ provides functions to create tables by
diff --git a/ORGWEBPAGE/index.org b/ORGWEBPAGE/index.org
index 6b909445d..de2a68d3a 100644
--- a/ORGWEBPAGE/index.org
+++ b/ORGWEBPAGE/index.org
@@ -55,9 +55,9 @@ a look at our [[http://orgmode.org/worg/org-quotes.php][collected quotes about O
 - <2009-02-10 Tue>: Release 6.22
 - <2009-02-02 Mon>: Release 6.21
 
-* Current Version (6.24)
+* Current Version (6.24a)
 
-The current version is 6.24.  To see what has changed in recent
+The current version is 6.24a.  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)
@@ -70,7 +70,7 @@ a bit behind the website release.
 
 ** The standard distribution
 
-Download as [[file:org-6.24.zip][zip file]] or [[file:org-6.24.tar.gz][gzipped tar archive]].  These archives contain
+Download as [[file:org-6.24a.zip][zip file]] or [[file:org-6.24a.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 73ac124c7..8dd8d1f75 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.24
+The version of this release is: 6.24a
 
 The homepage of Org is at http://orgmode.org
 
diff --git a/doc/org.texi b/doc/org.texi
index beffbe7b8..e4eadded4 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -3,7 +3,7 @@
 @setfilename ../../info/org
 @settitle The Org Manual
 
-@set VERSION 6.24
+@set VERSION 6.24a
 @set DATE March 2009
 
 @c Version and Contact Info
diff --git a/doc/orgcard.tex b/doc/orgcard.tex
index 77ab3dfc8..e629791a3 100644
--- a/doc/orgcard.tex
+++ b/doc/orgcard.tex
@@ -1,5 +1,5 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{6.24}
+\def\orgversionnumber{6.24a}
 \def\versionyear{2009}          % latest update
 \def\year{2009}                 % latest copyright year
 
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 34101e4a9..92c0a49f9 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.24
+;; Version: 6.24a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-archive.el b/lisp/org-archive.el
index bc5afa6bc..36d6ebaa5 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.24
+;; Version: 6.24a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-attach.el b/lisp/org-attach.el
index 7fb90b76f..182b6f59b 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.24
+;; Version: 6.24a
 
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-bbdb.el b/lisp/org-bbdb.el
index e0423bbfb..2bfc5167b 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.24
+;; Version: 6.24a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-bibtex.el b/lisp/org-bibtex.el
index 884082325..46e2bb572 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.24
+;; Version: 6.24a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 7c76ceee5..c4554f3ce 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.24
+;; Version: 6.24a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-colview-xemacs.el b/lisp/org-colview-xemacs.el
index 8fc7eb102..9b6bbacf8 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.24
+;; Version: 6.24a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-colview.el b/lisp/org-colview.el
index 108a07825..bfcde5bbb 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.24
+;; Version: 6.24a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index c6fe7471f..6a352334b 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.24
+;; Version: 6.24a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index 99334ae6f..38dde95f3 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.24
+;; Version: 6.24a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-export-latex.el b/lisp/org-export-latex.el
index 03eeb2dcb..7f570f0a2 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.24
+;; Version: 6.24a
 ;; Author: Bastien Guerry <bzg AT altern DOT org>
 ;; Maintainer: Carsten Dominik <carsten.dominik AT gmail DOT com>
 ;; Keywords: org, wp, tex
diff --git a/lisp/org-faces.el b/lisp/org-faces.el
index 7cac8ec0f..c20006349 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.24
+;; Version: 6.24a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-footnote.el b/lisp/org-footnote.el
index 92d32c819..684113fd8 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.24
+;; Version: 6.24a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-gnus.el b/lisp/org-gnus.el
index 120bbd16e..8cd559812 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.24
+;; Version: 6.24a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-id.el b/lisp/org-id.el
index 02bfb38b4..7e67738ad 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.24
+;; Version: 6.24a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-info.el b/lisp/org-info.el
index b0c051d9d..262649766 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.24
+;; Version: 6.24a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-irc.el b/lisp/org-irc.el
index dd3555569..a3c677b90 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.24
+;; Version: 6.24a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-jsinfo.el b/lisp/org-jsinfo.el
index 285169b8e..9d49ed2a4 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.24
+;; Version: 6.24a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-list.el b/lisp/org-list.el
index d37acd9c0..28ec70378 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.24
+;; Version: 6.24a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-mac-message.el b/lisp/org-mac-message.el
index cc2536018..9e637aba5 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.24
+;; Version: 6.24a
 ;; 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 06fc1c74e..c9e46d0b2 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.24
+;; Version: 6.24a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-mew.el b/lisp/org-mew.el
index 8c7a71719..0fc51953e 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.24
+;; Version: 6.24a
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/org-mhe.el b/lisp/org-mhe.el
index 12d875761..dfaa0a53c 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.24
+;; Version: 6.24a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-mouse.el b/lisp/org-mouse.el
index 45620f86f..3c39185a9 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.24
+;; Version: 6.24a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-plot.el b/lisp/org-plot.el
index 8149eab37..5eafe674c 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.24
+;; Version: 6.24a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-publish.el b/lisp/org-publish.el
index 64dd28b79..461adad0e 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.24
+;; Version: 6.24a
 
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-remember.el b/lisp/org-remember.el
index 2bee74fee..529c49326 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.24
+;; Version: 6.24a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-rmail.el b/lisp/org-rmail.el
index 56497472a..67d0f94d1 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.24
+;; Version: 6.24a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-table.el b/lisp/org-table.el
index d62d0d15b..0fde9871a 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.24
+;; Version: 6.24a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-timer.el b/lisp/org-timer.el
index 901f7ccca..4b0f09ae4 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.24
+;; Version: 6.24a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-vm.el b/lisp/org-vm.el
index dd4bfac4e..e86441cdb 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.24
+;; Version: 6.24a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-w3m.el b/lisp/org-w3m.el
index dc595e336..f7580f718 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.24
+;; Version: 6.24a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-wl.el b/lisp/org-wl.el
index 5b6cf5f56..a73e28aec 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.24
+;; Version: 6.24a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org.el b/lisp/org.el
index 461030ef0..d136dca20 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.24
+;; Version: 6.24a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -94,7 +94,7 @@
 
 ;;; Version
 
-(defconst org-version "6.24"
+(defconst org-version "6.24a"
   "The version number of the file org.el.")
 
 (defun org-version (&optional here)