diff --git a/ORGWEBPAGE/index.org b/ORGWEBPAGE/index.org
index 43f67ea19..4b3d05cfc 100644
--- a/ORGWEBPAGE/index.org
+++ b/ORGWEBPAGE/index.org
@@ -22,9 +22,9 @@ messages, BBDB entries, and any files related to the projects.  For
 printing and sharing of notes, an Org-mode file can be exported as a
 structured ASCII file, HTML, and LaTeX.
 
-* Current Version (6.00pre-4) and Compatibility
+* Current Version (6.00pre-5) and Compatibility
 
-The current version is 6.00pre-4.  To see what has changed in recent
+The current version is 6.00pre-5.  To see what has changed in recent
 releases, check this [[file:Changes.html][list of user-visible changes]].  These descriptions
 are extensive, to avoid that people will be printing the manual after
 each incremental release.  If you have an older version of the manual,
diff --git a/README_DIST b/README_DIST
index 489f329ff..5acba1e01 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.00pre-4
+The version of this release is: 6.00pre-5
 
 The homepage of Org is at http://orgmode.org
 
diff --git a/doc/org.texi b/doc/org.texi
index e86fea40c..6b2614550 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -3,7 +3,7 @@
 @setfilename ../../info/org
 @settitle The Org Manual
 
-@set VERSION 6.00pre-4
+@set VERSION 6.00pre-5
 @set DATE April 2008
 
 @dircategory Emacs
diff --git a/doc/orgcard.tex b/doc/orgcard.tex
index 016e1d260..cd863cca8 100644
--- a/doc/orgcard.tex
+++ b/doc/orgcard.tex
@@ -1,5 +1,5 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{6.00pre-4}
+\def\orgversionnumber{6.00pre-5}
 \def\versionyear{2008}          % latest update
 \def\year{2008}                 % latest copyright year
 
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 43004e299..d2bf3092d 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.00pre-4
+;; Version: 6.00pre-5
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-archive.el b/lisp/org-archive.el
index 39e8081f1..d3d43694d 100644
--- a/lisp/org-archive.el
+++ b/lisp/org-archive.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.00pre-4
+;; Version: 6.00pre-5
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-bbdb.el b/lisp/org-bbdb.el
index e8ccb55f4..5136cea84 100644
--- a/lisp/org-bbdb.el
+++ b/lisp/org-bbdb.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.00pre-4
+;; Version: 6.00pre-5
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-bibtex.el b/lisp/org-bibtex.el
index 8de4da2ef..807063fa0 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.00pre-4
+;; Version: 6.00pre-5
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 758b67397..b15854a41 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.00pre-4
+;; Version: 6.00pre-5
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-colview.el b/lisp/org-colview.el
index b1020f2df..0615ae881 100644
--- a/lisp/org-colview.el
+++ b/lisp/org-colview.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.00pre-4
+;; Version: 6.00pre-5
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 7bc24edb5..a5fa9e966 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.00pre-4
+;; Version: 6.00pre-5
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index c762599a6..c1ec833a0 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.00pre-4
+;; Version: 6.00pre-5
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-export-latex.el b/lisp/org-export-latex.el
index d86c797fb..75d2799ad 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.00pre-4
+;; Version: 6.00pre-5
 ;; 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 ad9ba704e..dedf810d8 100644
--- a/lisp/org-faces.el
+++ b/lisp/org-faces.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.00pre-4
+;; Version: 6.00pre-5
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-gnus.el b/lisp/org-gnus.el
index 7eade7aea..105bb6869 100644
--- a/lisp/org-gnus.el
+++ b/lisp/org-gnus.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.00pre-4
+;; Version: 6.00pre-5
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-info.el b/lisp/org-info.el
index c4eadd5f6..d8a2736a9 100644
--- a/lisp/org-info.el
+++ b/lisp/org-info.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.00pre-4
+;; Version: 6.00pre-5
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-infojs.el b/lisp/org-infojs.el
index 1d692af02..09c604d51 100644
--- a/lisp/org-infojs.el
+++ b/lisp/org-infojs.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.00pre-4
+;; Version: 6.00pre-5
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-irc.el b/lisp/org-irc.el
index 4516dfb1d..48f0f2923 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.00pre-4
+;; Version: 6.00pre-5
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-mac-message.el b/lisp/org-mac-message.el
index c84782c24..95e6f875c 100644
--- a/lisp/org-mac-message.el
+++ b/lisp/org-mac-message.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2008 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
-;; Version: 6.00pre-4
+;; Version: 6.00pre-5
 ;; 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 b5fe2ab2c..197aefbad 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.00pre-4
+;; Version: 6.00pre-5
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-mew.el b/lisp/org-mew.el
index 74f01eb79..b148f74e4 100644
--- a/lisp/org-mew.el
+++ b/lisp/org-mew.el
@@ -4,7 +4,7 @@
 ;;
 ;; Emacs Lisp Archive Entry
 ;; Filename: org-mew.el
-;; Version: 6.00pre-4
+;; Version: 6.00pre-5
 ;; Author: Bastien Guerry <bzg AT altern DOT org>
 ;; Maintainer: Bastien Guerry <bzg AT altern DOT org>
 ;; Keywords: org, mail, Mew
diff --git a/lisp/org-mhe.el b/lisp/org-mhe.el
index af04aafc0..42f9873ee 100644
--- a/lisp/org-mhe.el
+++ b/lisp/org-mhe.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.00pre-4
+;; Version: 6.00pre-5
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-mouse.el b/lisp/org-mouse.el
index 741dc13e2..04a2b2024 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.00pre-4
+;; Version: 6.00pre-5
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-publish.el b/lisp/org-publish.el
index 88bfee3cd..2562aa84b 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.00pre-4
+;; Version: 6.00pre-5
 
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-remember.el b/lisp/org-remember.el
index 1249b5754..c5098ef2c 100644
--- a/lisp/org-remember.el
+++ b/lisp/org-remember.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.00pre-4
+;; Version: 6.00pre-5
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-rmail.el b/lisp/org-rmail.el
index 311bfdbb1..7c978adfb 100644
--- a/lisp/org-rmail.el
+++ b/lisp/org-rmail.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.00pre-4
+;; Version: 6.00pre-5
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 52ff7ba6c..01bad0cae 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.00pre-4
+;; Version: 6.00pre-5
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-vm.el b/lisp/org-vm.el
index 83b9ec812..5cf94dc22 100644
--- a/lisp/org-vm.el
+++ b/lisp/org-vm.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.00pre-4
+;; Version: 6.00pre-5
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-wl.el b/lisp/org-wl.el
index e5b4c2ed6..e474c34cf 100644
--- a/lisp/org-wl.el
+++ b/lisp/org-wl.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.00pre-4
+;; Version: 6.00pre-5
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org.el b/lisp/org.el
index 616f108a1..071283e55 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.00pre-4
+;; Version: 6.00pre-5
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -93,7 +93,7 @@
 
 ;;; Version
 
-(defconst org-version "6.00pre-4"
+(defconst org-version "6.00pre-5"
   "The version number of the file org.el.")
 
 (defun org-version (&optional here)