diff --git a/ORGWEBPAGE/Changes.org b/ORGWEBPAGE/Changes.org
index 244be13d0..e5afaab40 100644
--- a/ORGWEBPAGE/Changes.org
+++ b/ORGWEBPAGE/Changes.org
@@ -11,7 +11,7 @@
 #+LINK_HOME: http://orgmode.org
 
 
-* Version 6.09 (in preparation)
+* Version 6.09
 :PROPERTIES:
 :VISIBILITY: content
 :END:
@@ -29,7 +29,7 @@
     sure the matching is done correctly (even though "txt" will
     be recognized and still be interpreted as an extension).
 
-    There is now a shortcurt to get many file types visited by
+    There is now a shortcut to get many file types visited by
     Emacs.  If org-file-apps contains `(auto-mode . emacs)', then
     any files that are matched by `auto-mode-alist' will be
     visited in emacs.
@@ -48,7 +48,8 @@
       now use =n= instead of =c=.
     - The file list is now always retrieved from the directory
       itself, not from the "Attachments" property.  We still
-      keep, as a kind o backup info.
+      keep this property by default, but you can turn it off, by
+      customizing the variable =org-attach-file-list-property=.
 
 * Version 6.08
 
diff --git a/ORGWEBPAGE/index.org b/ORGWEBPAGE/index.org
index 1081a34da..73e5bfba3 100644
--- a/ORGWEBPAGE/index.org
+++ b/ORGWEBPAGE/index.org
@@ -39,9 +39,9 @@ structured ASCII file, HTML, and LaTeX.
 
 Check out the [[file:GoogleTech.org][Google Tech Talk]] about Org-mode.
 
-* Current Version (6.08c) and Compatibility
+* Current Version (6.09) and Compatibility
 
-The current version is 6.08c.  To see what has changed in recent
+The current version is 6.09.  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,
@@ -58,7 +58,7 @@ release.
 
 ** The standard distribution
 
-Download as [[file:org-6.08c.zip][zip file]] or [[file:org-6.08c.tar.gz][gzipped tar archive]].  These archives contain
+Download as [[file:org-6.09.zip][zip file]] or [[file:org-6.09.tar.gz][gzipped tar archive]].  These archives contain
 both the Lisp file org.el and the documentation in PDF and (TeX)Info
 formats.  A shell script to simplify upgrading to the newest release
 has been posted [[http://www.philfam.co.uk/pete/GTD/org-mode/update-org.sh][here]].
diff --git a/README_DIST b/README_DIST
index e260cb725..bb5ec53ab 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.09pre01
+The version of this release is: 6.09
 
 The homepage of Org is at http://orgmode.org
 
diff --git a/doc/org.texi b/doc/org.texi
index 2ec0c1df6..8b2e917d9 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -3,7 +3,7 @@
 @setfilename ../../info/org
 @settitle The Org Manual
 
-@set VERSION 6.09pre01
+@set VERSION 6.09
 @set DATE October 2008
 
 @dircategory Emacs
diff --git a/doc/orgcard.tex b/doc/orgcard.tex
index e55969c60..51579ab2a 100644
--- a/doc/orgcard.tex
+++ b/doc/orgcard.tex
@@ -1,5 +1,5 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{6.09pre01}
+\def\orgversionnumber{6.09}
 \def\versionyear{2008}          % latest update
 \def\year{2008}                 % latest copyright year
 
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index ce2d3e7cb..675f1160f 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.09pre01
+;; Version: 6.09
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-archive.el b/lisp/org-archive.el
index 7f92f40ff..c31b71715 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.09pre01
+;; Version: 6.09
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-attach.el b/lisp/org-attach.el
index 27a1adb8e..16a43211e 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.09pre01
+;; Version: 6.09
 
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-bbdb.el b/lisp/org-bbdb.el
index 551e6ca3b..324a68bc9 100644
--- a/lisp/org-bbdb.el
+++ b/lisp/org-bbdb.el
@@ -6,7 +6,7 @@
 ;;         Thomas Baumann <thomas dot baumann at ch dot tum dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.09pre01
+;; Version: 6.09
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-bibtex.el b/lisp/org-bibtex.el
index e45ef0a8c..546c70b57 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.09pre01
+;; Version: 6.09
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 93e197cee..06db6103d 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.09pre01
+;; Version: 6.09
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-colview-xemacs.el b/lisp/org-colview-xemacs.el
index 4272b2fa2..d1ba48ce5 100644
--- a/lisp/org-colview-xemacs.el
+++ b/lisp/org-colview-xemacs.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.09pre01
+;; Version: 6.09
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-colview.el b/lisp/org-colview.el
index 7c24e044b..287ba5590 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.09pre01
+;; Version: 6.09
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 2322cd894..a22c0d41c 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.09pre01
+;; Version: 6.09
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index 49bd7f721..b2840a408 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.09pre01
+;; Version: 6.09
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-export-latex.el b/lisp/org-export-latex.el
index 208504293..f0e18e495 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.09pre01
+;; Version: 6.09
 ;; 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 63ad87fbd..e617d78c3 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.09pre01
+;; Version: 6.09
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-gnus.el b/lisp/org-gnus.el
index ba99b70b3..5687006fe 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.09pre01
+;; Version: 6.09
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-id.el b/lisp/org-id.el
index c9fee695e..46394652f 100644
--- a/lisp/org-id.el
+++ b/lisp/org-id.el
@@ -4,7 +4,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.09pre01
+;; Version: 6.09
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-info.el b/lisp/org-info.el
index f2e5e0193..9231d16e9 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.09pre01
+;; Version: 6.09
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-irc.el b/lisp/org-irc.el
index 8c45ea940..12603d76c 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.09pre01
+;; Version: 6.09
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-jsinfo.el b/lisp/org-jsinfo.el
index d875d969b..83eb45f54 100644
--- a/lisp/org-jsinfo.el
+++ b/lisp/org-jsinfo.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.09pre01
+;; Version: 6.09
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-list.el b/lisp/org-list.el
index 00c4035d1..4438e2102 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -6,7 +6,7 @@
 ;;         Bastien Guerry <bzg AT altern DOT org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.09pre01
+;; Version: 6.09
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-mac-message.el b/lisp/org-mac-message.el
index a3f30bcca..30c6bb232 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.09pre01
+;; Version: 6.09
 ;; 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 c3e120c1a..89e8d5d29 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.09pre01
+;; Version: 6.09
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-mew.el b/lisp/org-mew.el
index 5cf53aba5..48d2e2772 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.09pre01
+;; Version: 6.09
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/org-mhe.el b/lisp/org-mhe.el
index 80f25e923..64c60b3e2 100644
--- a/lisp/org-mhe.el
+++ b/lisp/org-mhe.el
@@ -5,7 +5,7 @@
 ;; Author: Thomas Baumann <thomas dot baumann at ch dot tum dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.09pre01
+;; Version: 6.09
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-mouse.el b/lisp/org-mouse.el
index 58fd5d398..dbee77e7d 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.09pre01
+;; Version: 6.09
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-publish.el b/lisp/org-publish.el
index e77025ff9..62cd819af 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.09pre01
+;; Version: 6.09
 
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-remember.el b/lisp/org-remember.el
index 28680339f..6586edacd 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.09pre01
+;; Version: 6.09
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-rmail.el b/lisp/org-rmail.el
index 2310fa52f..84fe44cd5 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.09pre01
+;; Version: 6.09
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 4d63cb8e4..53f026ba9 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.09pre01
+;; Version: 6.09
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-vm.el b/lisp/org-vm.el
index c412bf59c..cc4d10b6f 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.09pre01
+;; Version: 6.09
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-wl.el b/lisp/org-wl.el
index d444b9eaf..91a835bb4 100644
--- a/lisp/org-wl.el
+++ b/lisp/org-wl.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.09pre01
+;; Version: 6.09
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org.el b/lisp/org.el
index e72508a62..1e1061891 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.09pre01
+;; Version: 6.09
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -92,7 +92,7 @@
 
 ;;; Version
 
-(defconst org-version "6.09pre01"
+(defconst org-version "6.09"
   "The version number of the file org.el.")
 
 (defun org-version (&optional here)