Use the org-mode that comes with GNU Emacs 24.1+.