diff --git a/Rakefile b/Rakefile
index cfb20cc..54015a8 100644
--- a/Rakefile
+++ b/Rakefile
@@ -38,7 +38,9 @@ task :release => [:bundle, :package, 'doc:archive'] do
   sh "googlecode_upload.py -s \"YASnippet Document #{$version}\"" +
     " -p yasnippet -l \"Featured,Type-Docs,OpSys-All\"" +
     " pkg/yasnippet-doc-#{$version}.tar.bz2"
-
+  FileUtils.cp "yasnippet-bundle.el", "pkg/yasnippet-bundle-#{$version}.el"
+  sh "echo for ELPA | mutt -a pkg/yasnippet-bundle-#{$version}.el -s " +
+     "'YASnippet bundle v#{$version}' elpa@tromey.com"
 end
 
 rule '.html' => '.rst' do |t|
diff --git a/doc/changelog.html b/doc/changelog.html
index bd2ee87..ab1b98b 100644
--- a/doc/changelog.html
+++ b/doc/changelog.html
@@ -41,12 +41,21 @@
         <div class="right-corner">
           <div class="left-corner">
 	  <div class="section" id="id1">
+<h1>0.5.10 / 2009-02-11</h1>
+<ul class="simple">
+<li>Added <em>grouping</em> support so that the snippets in the menu can be
+groupped together.</li>
+<li>Make the bundle <a class="reference external" href="http://tromey.com/elpa/index.html">ELPA</a>
+compatible.</li>
+</ul>
+</div>
+<div class="section" id="id2">
 <h1>0.5.9 / 2009-01-21</h1>
 <ul class="simple">
 <li>Fixed the bug of disabling the auto-indenting of <tt class="docutils literal"><span class="pre">cc-mode</span></tt>.</li>
 </ul>
 </div>
-<div class="section" id="id2">
+<div class="section" id="id3">
 <h1>0.5.8 / 2009-01-15</h1>
 <ul class="simple">
 <li>Added a <tt class="docutils literal"><span class="pre">key</span></tt> property in snippet definition for snippet names
@@ -65,7 +74,7 @@ happened if we have proper regression test.</li>
 <li>Added a workaround for <tt class="docutils literal"><span class="pre">c-electric-</span></tt> serial commands (<a class="reference external" href="http://code.google.com/p/yasnippet/issues/detail?id=27">Issue 27</a>).</li>
 </ul>
 </div>
-<div class="section" id="id3">
+<div class="section" id="id4">
 <h1>0.5.7 / 2008-12-03</h1>
 <ul class="simple">
 <li>Fixed <a class="reference external" href="http://code.google.com/p/yasnippet/issues/detail?id=28">Issue 28</a> of
@@ -78,7 +87,7 @@ properly clean up snippet (by joaotavora).</li>
 <tt class="docutils literal"><span class="pre">$&gt;</span></tt> support. Here's the <a class="reference external" href="http://pluskid.lifegoo.com/upload/project/yasnippet/doc/define_snippet.html#indenting">doc for $&gt; indenting</a>.</li>
 </ul>
 </div>
-<div class="section" id="id4">
+<div class="section" id="id5">
 <h1>0.5.6 / 2008-08-07</h1>
 <ul class="simple">
 <li>Added a buffer local variable <tt class="docutils literal"><span class="pre">yas/dont-activate</span></tt> to turn off
@@ -90,7 +99,7 @@ properly clean up snippet (by joaotavora).</li>
 property is defined.</li>
 </ul>
 </div>
-<div class="section" id="id5">
+<div class="section" id="id6">
 <h1>0.5.5 / 2008-05-29</h1>
 <ul class="simple">
 <li>Tweak <tt class="docutils literal"><span class="pre">yas/extra-mode-hooks</span></tt> so that it can be more easily
@@ -99,7 +108,7 @@ customized.</li>
 modes.</li>
 </ul>
 </div>
-<div class="section" id="id6">
+<div class="section" id="id7">
 <h1>0.5.4 / 2008-05-15</h1>
 <ul class="simple">
 <li>Added <tt class="docutils literal"><span class="pre">ox-mode-hook</span></tt> and <tt class="docutils literal"><span class="pre">python-mode-hook</span></tt> to
@@ -107,7 +116,7 @@ modes.</li>
 in those modes.</li>
 </ul>
 </div>
-<div class="section" id="id7">
+<div class="section" id="id8">
 <h1>0.5.3 / 2008-05-07</h1>
 <ul class="simple">
 <li>Fix indent of python-mode snippets.</li>
@@ -116,20 +125,20 @@ Mike.</li>
 <li>Fix a bug of condition system.</li>
 </ul>
 </div>
-<div class="section" id="id8">
+<div class="section" id="id9">
 <h1>0.5.2 / 2008-04-20</h1>
 <ul class="simple">
 <li>Fix a bug for comparing string to symbol using <tt class="docutils literal"><span class="pre">string=</span></tt> (which
 will fire an error).</li>
 </ul>
 </div>
-<div class="section" id="id9">
+<div class="section" id="id10">
 <h1>0.5.1 / 2008-04-14</h1>
 <ul class="simple">
 <li>Use a beautiful css style in the document.</li>
 </ul>
 </div>
-<div class="section" id="id10">
+<div class="section" id="id11">
 <h1>0.5.0 / 2008-04-10</h1>
 <ul class="simple">
 <li>Integrate with hippie-expand. Just add <tt class="docutils literal"><span class="pre">yas/hippie-try-expand</span></tt> to
@@ -144,7 +153,7 @@ problem now.</li>
 distribution.</li>
 </ul>
 </div>
-<div class="section" id="id11">
+<div class="section" id="id12">
 <h1>0.4.5 / 2008-04-07</h1>
 <ul class="simple">
 <li>Merge the latest dropdown-list.el.</li>
@@ -154,33 +163,33 @@ error when several (more than two) snippets overlaps. Thanks
 <a class="reference external" href="mailto:sunwaybupt&#64;newsmth">sunwaybupt&#64;newsmth</a> for reporting this bug.</li>
 </ul>
 </div>
-<div class="section" id="id12">
+<div class="section" id="id13">
 <h1>0.4.4 / 2008-03-24</h1>
 <ul class="simple">
 <li>Bug fix: dropdown-list.el doesn't recognize [return] properly.</li>
 </ul>
 </div>
-<div class="section" id="id13">
+<div class="section" id="id14">
 <h1>0.4.3 / 2008-03-23</h1>
 <ul class="simple">
 <li>Bug fix: failed to recognize user customized yas/trigger-key.</li>
 </ul>
 </div>
-<div class="section" id="id14">
+<div class="section" id="id15">
 <h1>0.4.2 / 2008-03-22</h1>
 <ul class="simple">
 <li>Make a separate document package for release. Also make document
 available online.</li>
 </ul>
 </div>
-<div class="section" id="id15">
+<div class="section" id="id16">
 <h1>0.4.1 / 2008-03-21</h1>
 <ul class="simple">
 <li>Make sure <tt class="docutils literal"><span class="pre">yas/minor-mode</span></tt>'s key bindings always take priority to
 other minor modes.</li>
 </ul>
 </div>
-<div class="section" id="id16">
+<div class="section" id="id17">
 <h1>0.4.0 / 2008-03-20</h1>
 <ul class="simple">
 <li>Document refinement and released with YASnippet. Most of the Online
@@ -191,7 +200,7 @@ selecting multiple candidates. Thanks to <a class="reference external" href="htt
 <li>yas/before-expand-snippet-hook</li>
 </ul>
 </div>
-<div class="section" id="id17">
+<div class="section" id="id18">
 <h1>0.3.2 / 2008-03-19</h1>
 <ul class="simple">
 <li>Enhancement: A better way to define minor-mode. Thanks to Kentaro
@@ -199,13 +208,13 @@ Kuribayashi. See <a class="reference external" href="https://groups.google.com/g
 for more details.</li>
 </ul>
 </div>
-<div class="section" id="id18">
+<div class="section" id="id19">
 <h1>0.3.1 / 2008-03-17</h1>
 <ul class="simple">
 <li>Bug fix: Emacs get confused when a field is deleted. See <a class="reference external" href="http://code.google.com/p/yasnippet/issues/detail?id=10">issue 10</a>.</li>
 </ul>
 </div>
-<div class="section" id="id19">
+<div class="section" id="id20">
 <h1>0.3.0 / 2008-03-16</h1>
 <ul class="simple">
 <li>Add a <tt class="docutils literal"><span class="pre">yas/after-exit-snippet-hook</span></tt> so that you can do something like
@@ -221,7 +230,7 @@ candidate for the same snippet key.</li>
 candidate when in text mode.</li>
 </ul>
 </div>
-<div class="section" id="id20">
+<div class="section" id="id21">
 <h1>0.2.3 / 2008-03-15</h1>
 <ul class="simple">
 <li>Bug in non-window (-nw) mode when there's multiple candidate to
@@ -230,20 +239,20 @@ expand. See <a class="reference external" href="http://code.google.com/p/yasnipp
 field.</li>
 </ul>
 </div>
-<div class="section" id="id21">
+<div class="section" id="id22">
 <h1>0.2.2 / 2008-03-13</h1>
 <ul class="simple">
 <li>Added customized face for fields and mirrors. Better in dark
 background. And users can customize it.</li>
 </ul>
 </div>
-<div class="section" id="id22">
+<div class="section" id="id23">
 <h1>0.2.1 / 2008-03-10</h1>
 <ul class="simple">
 <li>Fix the insert-behind problem under both Emacs 22 and Emacs 23.</li>
 </ul>
 </div>
-<div class="section" id="id23">
+<div class="section" id="id24">
 <h1>0.2.0 / 2008-03-10</h1>
 <ul class="simple">
 <li>Use big keymap overlay to detect <tt class="docutils literal"><span class="pre">insert-behind</span></tt> event manually to
@@ -254,14 +263,14 @@ details.</li>
 <tt class="docutils literal"><span class="pre">java-mode</span></tt>. They'll share snippets defined for <tt class="docutils literal"><span class="pre">cc-mode</span></tt>.</li>
 </ul>
 </div>
-<div class="section" id="id24">
+<div class="section" id="id25">
 <h1>0.1.1 / 2008-03-08</h1>
 <ul class="simple">
 <li>Add a rake task to upload to google code.</li>
 <li>Use elisp compile-bundle function instead of python scrip</li>
 </ul>
 </div>
-<div class="section" id="id25">
+<div class="section" id="id26">
 <h1>0.1.0 / 2008-03-07</h1>
 <ul class="simple">
 <li>Embedded elisp support.</li>
diff --git a/doc/changelog.rst b/doc/changelog.rst
index f4b896c..3e956c8 100644
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -6,6 +6,14 @@ ChangeLog
 :Contact: pluskid@gmail.com
 :Date: 2008-03-22
 
+0.5.10 / 2009-02-11
+===================
+
+* Added *grouping* support so that the snippets in the menu can be
+  groupped together.
+* Make the bundle `ELPA <http://tromey.com/elpa/index.html>`_
+  compatible.
+
 0.5.9 / 2009-01-21
 ==================
 
diff --git a/yasnippet.el b/yasnippet.el
index 4f4ff41..8efcd96 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -4,7 +4,7 @@
 
 ;; Author: pluskid <pluskid@gmail.com>
 ;; Created: 02 Mar 2008
-;; Version: 0.5.9
+;; Version: 0.5.10
 ;; Keywords: snippet, textmate
 ;; URL: http://code.google.com/p/yasnippet/
 ;; EmacsWiki: YaSnippetMode
@@ -207,7 +207,7 @@ to expand.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Internal variables
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(defvar yas/version "0.5.9")
+(defvar yas/version "0.5.10")
 
 (defvar yas/snippet-tables (make-hash-table)
   "A hash table of snippet tables corresponding to each major-mode.")