Index: /trunk/aclocal.m4
===================================================================
--- /trunk/aclocal.m4	(revision 349)
+++ /trunk/aclocal.m4	(revision 350)
@@ -409,5 +409,5 @@
 x_libraries=NONE
 DESTDIR=
-SH_ENABLE_OPTS="ssp db-reload xml-log message-queue login-watch process-check port-check mounts-check logfile-monitor userfiles debug ptrace static network udp nocl stealth micro-stealth install-name identity khide suidcheck base largefile mail external-scripts encrypt srp dnmalloc ipv6"
+SH_ENABLE_OPTS="ssp db-reload xml-log message-queue login-watch process-check port-check mounts-check logfile-monitor userfiles debug ptrace static network udp nocl stealth micro-stealth install-name identity khide suidcheck base largefile mail external-scripts encrypt srp dnmalloc ipv6 shellexpand"
 SH_WITH_OPTS="prelude libprelude-prefix database libwrap cflags libs console altconsole timeserver alttimeserver rnd egd-socket port logserver altlogserver kcheck gpg keyid checksum fp recipient sender trusted tmp-dir config-file log-file pid-file state-dir data-file html-file"
 
Index: /trunk/configure.ac
===================================================================
--- /trunk/configure.ac	(revision 349)
+++ /trunk/configure.ac	(revision 350)
@@ -12,5 +12,5 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 2.8.5)
+AM_INIT_AUTOMAKE(samhain, 2.8.5a)
 AC_DEFINE([SAMHAIN], 1, [Application is samhain])
 AC_CANONICAL_HOST
Index: /trunk/docs/Changelog
===================================================================
--- /trunk/docs/Changelog	(revision 349)
+++ /trunk/docs/Changelog	(revision 350)
@@ -1,3 +1,8 @@
+2.8.5a:
+	* Fix autolocal.m4 for new configure option
+
 2.8.5:
+	* Detect non-working /dev/kmem in configure script, and fix
+	  a bug in the samhain_kmem kernel module.
 	* Fix wrong handler for LogmonMarkSeverity (reported by S. Chittenden)
 	* Better protection against the 'intruder on server' scenario