diff --git a/ipmitool/ChangeLog b/ipmitool/ChangeLog
index 3fe4e67..e499f74 100644
--- a/ipmitool/ChangeLog
+++ b/ipmitool/ChangeLog
@@ -1,3 +1,14 @@
+version 1.8.8
+	* Fix segfaults in sensor data repository list
+	* Fix ipmievd to open interface before daemonizing
+	* Fix IPMIv1.5 authtype NONE to ignore supplied password
+	* Fix cipher suite display bug in lan print
+	* Fix typo in IPMIv2 SOL output when sending break
+	* Fix improper LUN handling with Tyan SOL
+	* Add LUN support to OpenIPMI interface
+	* Add support for Kontron OEM commands
+	* Update to Kontron Firmware Update command
+
 version 1.8.7
 	* Remove nuclear clause from license
 	* Add Sun OEM command for blades
diff --git a/ipmitool/configure.in b/ipmitool/configure.in
index 50773f3..f6c8710 100644
--- a/ipmitool/configure.in
+++ b/ipmitool/configure.in
@@ -3,7 +3,7 @@ dnl autoconf for ipmitool
 dnl
 AC_INIT([src/ipmitool.c])
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE([ipmitool], [1.8.7])
+AM_INIT_AUTOMAKE([ipmitool], [1.8.8])
 AM_CONFIG_HEADER(config.h)
 AC_CONFIG_SRCDIR([src/ipmitool.c])
 AC_PREREQ(2.50)
diff --git a/ipmitool/control/ipmitool.spec.in b/ipmitool/control/ipmitool.spec.in
index c2ba29b..1bcf8b7 100644
--- a/ipmitool/control/ipmitool.spec.in
+++ b/ipmitool/control/ipmitool.spec.in
@@ -62,6 +62,17 @@ rm -rf $RPM_BUILD_DIR/ipmitool-@VERSION@
 %doc %{_datadir}/doc/ipmitool/*
 
 %changelog
+* Tue May 02 2006 <duncan@iceblink.org>  1.8.8-1
+ - Fix segfaults in sensor data repository list
+ - Fix ipmievd to open interface before daemonizing
+ - Fix IPMIv1.5 authtype NONE to ignore supplied password
+ - Fix cipher suite display bug in lan print
+ - Fix typo in IPMIv2 SOL output when sending break
+ - Fix improper LUN handling with Tyan SOL
+ - Add LUN support to OpenIPMI interface
+ - Add support for Kontron OEM commands
+ - Update to Kontron Firmware Update command
+
 * Sun Mar 19 2006 <duncan@iceblink.org>  1.8.7-1
  - Add Sun OEM command for blades
  - Increase argument size for raw commands in shell/exec
diff --git a/ipmitool/debian/changelog b/ipmitool/debian/changelog
index 4018a1b..9310796 100644
--- a/ipmitool/debian/changelog
+++ b/ipmitool/debian/changelog
@@ -1,3 +1,23 @@
+ipmitool (1.8.7-2) unstable; urgency=low
+
+  * Fix typo in init.d/ipmievd. (Closes: #361309)
+
+ -- Petter Reinholdtsen <pere@debian.org>  Sat,  8 Apr 2006 06:44:31 +0200
+
+ipmitool (1.8.7-1) unstable; urgency=low
+
+  * New upstream version.
+    - Dropped nuclear clause from the copyright.  Updated debian/copyright
+      to reflect this.
+    - ipmievd now store pid in /var/run/ipmievd.pid.  Adjust init.d
+      script to use it.
+  * Rename /etc/default/ipmievd variable IPMIEVD_OPTS is renamed to
+    IPMIEVD_OPTIONS to stay compatible with upstream and other
+    distributions.  Add backwards compatibility code with a warning to
+    the users of the old variable.
+
+ -- Petter Reinholdtsen <pere@debian.org>  Sun, 26 Mar 2006 21:11:08 +0200
+
 ipmitool (1.8.6-2) unstable; urgency=low
 
   * Add ia64 as an supported arch. (Closes: #355930)
diff --git a/ipmitool/debian/ipmitool.ipmievd.init b/ipmitool/debian/ipmitool.ipmievd.init
index 1783d1a..bcb7629 100644
--- a/ipmitool/debian/ipmitool.ipmievd.init
+++ b/ipmitool/debian/ipmitool.ipmievd.init
@@ -46,6 +46,13 @@ IPMIEVD_OPTIONS="open daemon"
 # Read config file if it is present.
 [ -f /etc/default/$NAME ] && . /etc/default/$NAME
 
+# Backwards compatibility with version 1.8.6-2 and 1.8.6-1.  The
+# variable was renamed to be compatible with upstream, SuSe and RedHat.
+if [ -n "$IPMIEVD_OPTS" ]; then
+    echo "warning: /etc/default/$NAME variable IPMIEVD_OPTS should be renamed to IPMIEVD_OPTIONS"
+    IPMIEVD_OPTIONS="$IPMIEVD_OPTS"
+fi
+
 #
 #	Function that starts the daemon/service.
 #