diff --git a/ChangeLog b/ChangeLog
index 8edc2fe0c..a4d1cbae1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-24  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* configure.ac: Bump version to 0.6.96.
+	* docs/multiboot.texi: Include `version.texi' instead of hardcoding
+	version number.
+
 2009-12-24  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* docs/Makefile.am (EXTRA_DIST): Remove `menu.lst'.
diff --git a/configure.ac b/configure.ac
index ee72134b5..2b1e812e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ dnl LIABILITY OF ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE
 dnl USE OF THIS SOFTWARE.
 
 AC_PREREQ(2.57)
-AC_INIT([Multiboot], [0.6.95], [bug-grub@gnu.org])
+AC_INIT([Multiboot], [0.6.96], [bug-grub@gnu.org])
 AC_CONFIG_SRCDIR([docs/multiboot.texi])
 AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE
diff --git a/docs/multiboot.texi b/docs/multiboot.texi
index 828cf663e..a9c154860 100644
--- a/docs/multiboot.texi
+++ b/docs/multiboot.texi
@@ -1,7 +1,7 @@
 \input texinfo @c -*-texinfo-*-
 @c %**start of header
 @setfilename multiboot.info
-@set VERSION 0.6.96
+@include version.texi
 @settitle Multiboot Specification version @value{VERSION}
 @c Unify all our little indices for now.
 @syncodeindex fn cp