diff --git a/.cvsignore b/.cvsignore
index 855b3c9..4b4c094 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-freeipmi-0.7.16.tar.gz
+freeipmi-0.8.2.tar.gz
diff --git a/freeipmi-0.6.4-silent.patch b/freeipmi-0.6.4-silent.patch
index 5050c68..5b43fc9 100644
--- a/freeipmi-0.6.4-silent.patch
+++ b/freeipmi-0.6.4-silent.patch
@@ -1,11 +1,13 @@
-diff -up freeipmi-0.6.4/bmc-watchdog/freeipmi-bmc-watchdog.logrotate.silent freeipmi-0.6.4/bmc-watchdog/freeipmi-bmc-watchdog.logrotate
---- freeipmi-0.6.4/bmc-watchdog/freeipmi-bmc-watchdog.logrotate.silent	2008-07-28 12:26:29.000000000 +0200
-+++ freeipmi-0.6.4/bmc-watchdog/freeipmi-bmc-watchdog.logrotate	2008-07-28 12:26:44.000000000 +0200
+Fix unecessary logrotate message for bmc-watchdog (#456648)
+
+diff -up freeipmi-0.8.2/bmc-watchdog/bmc-watchdog.logrotate.orig freeipmi-0.8.2/bmc-watchdog/bmc-watchdog.logrotate
+--- freeipmi-0.8.2/bmc-watchdog/bmc-watchdog.logrotate.orig	2009-10-01 20:09:57.000000000 +0200
++++ freeipmi-0.8.2/bmc-watchdog/bmc-watchdog.logrotate	2010-01-07 16:35:55.000000000 +0100
 @@ -11,6 +11,6 @@
    nomail
    notifempty
    postrotate
--      /etc/init.d/freeipmi-bmc-watchdog condrestart
-+      /etc/init.d/freeipmi-bmc-watchdog condrestart > /dev/null 2>&1
+-  /etc/init.d/bmc-watchdog condrestart
++  /etc/init.d/bmc-watchdog condrestart >/dev/null 2>&1
    endscript
  }
diff --git a/freeipmi-0.7.12-lsb.patch b/freeipmi-0.7.12-lsb.patch
deleted file mode 100644
index 8393681..0000000
--- a/freeipmi-0.7.12-lsb.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-523177:  Initscript: ipmidetectd incorrect exit codes
-523169:  Initscript: ipmidetectd missing actions
-
-Implement try-restart and force-reload actions.
-Return correct exit codes.
-
-diff -up freeipmi-0.7.12/ipmidetect/freeipmi-ipmidetectd.init.lsb freeipmi-0.7.12/ipmidetect/freeipmi-ipmidetectd.init
---- freeipmi-0.7.12/ipmidetect/freeipmi-ipmidetectd.init.lsb	2007-12-14 20:16:25.000000000 +0100
-+++ freeipmi-0.7.12/ipmidetect/freeipmi-ipmidetectd.init	2009-09-14 15:38:12.000000000 +0200
-@@ -14,6 +14,7 @@
- ### END INIT INFO
- 
- IPMIDETECTD=/usr/sbin/ipmidetectd
-+IPMIDETECTD_CFG=/etc/ipmidetectd.cfg
- 
- [ -f $IPMIDETECTD ] || exit 1
- 
-@@ -21,6 +22,11 @@ IPMIDETECTD=/usr/sbin/ipmidetectd
- if [ -f /etc/rc.d/init.d/functions ] ; then
-     . /etc/rc.d/init.d/functions
-     Xstart() {
-+        if [ ! -f IPMIDETECTD_CFG ] ; then
-+            failure; echo
-+            RETVAL=6
-+            return
-+        fi
-         daemon $IPMIDETECTD
-         RETVAL=$?
-         echo
-@@ -89,7 +95,7 @@ case "$1" in
-    	echo -n "Shutting down ipmidetectd: "
- 	Xstop
-    	;;
--  restart|reload)
-+  restart|force-reload)
-    	$0 stop
-    	$0 start
-    	RETVAL=$?
-@@ -97,10 +103,11 @@ case "$1" in
-   status)
-         Xstatus
-    	;;
--  condrestart)
-+  condrestart|try-restart)
-         Xcondrestart
-    	;;
-   *)
--	echo "Usage: $0 {start|stop|restart|status|condrestart}"
-+	echo "Usage: $0 {start|stop|restart|status|condrestart|force-reload|try-restart}"
--	exit 1
-+	exit 2
- esac
-+exit $RETVAL
diff --git a/freeipmi.spec b/freeipmi.spec
index 6997ee1..997e60e 100644
--- a/freeipmi.spec
+++ b/freeipmi.spec
@@ -5,14 +5,13 @@
 Release: 1%{?dist}
 
 Name: freeipmi
-Version: 0.7.16
+Version: 0.8.2
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnu.org/software/freeipmi/
 Source: ftp://ftp.gluster.com/pub/freeipmi/%{version}/%{name}-%{version}.tar.gz
 Patch1: freeipmi-0.6.4-silent.patch
 Patch2: freeipmi-0.6.4-pathsep.patch
-Patch3: freeipmi-0.7.12-lsb.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libgcrypt-devel texinfo
 Requires(pre): chkconfig
@@ -64,25 +63,24 @@ Provides a tool and a daemon for IPMI node detection.
 %prep
 %setup -q
 %patch1 -p1 -b .silent
-%patch2 -p1 -b .pathsep
-%patch3 -p1 -b .lsb
+#%patch2 -p1 -b .pathsep
 
 %build
 export CFLAGS="-D_GNU_SOURCE $RPM_OPT_FLAGS"
 %configure --program-prefix=%{?_program_prefix:%{_program_prefix}} \
            %{?_enable_debug} --disable-static
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT
-DESTDIR="$RPM_BUILD_ROOT" make install
+make install DESTDIR="$RPM_BUILD_ROOT"
 # fix coherance problems with associated script filenames
 mkdir -p $RPM_BUILD_ROOT/%{_initrddir}/
 # if check needed for SLES systems
 if [[ "%{_sysconfdir}/init.d" != "%{_initrddir}" ]]
 then
-mv $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/freeipmi-bmc-watchdog $RPM_BUILD_ROOT/%{_initrddir}/freeipmi-bmc-watchdog
-mv $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/freeipmi-ipmidetectd $RPM_BUILD_ROOT/%{_initrddir}/freeipmi-ipmidetectd
+mv $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/bmc-watchdog $RPM_BUILD_ROOT/%{_initrddir}/bmc-watchdog
+mv $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/ipmidetectd $RPM_BUILD_ROOT/%{_initrddir}/ipmidetectd
 fi
 rm -f %{buildroot}%{_infodir}/dir
 # kludge to get around rpmlint complaining about 0 length semephore file
@@ -145,6 +143,7 @@ fi
 %doc %{_datadir}/doc/%{name}/README
 %doc %{_datadir}/doc/%{name}/README.argp
 %doc %{_datadir}/doc/%{name}/README.build
+%doc %{_datadir}/doc/%{name}/README.openipmi
 %doc %{_datadir}/doc/%{name}/README.sunbmc
 %doc %{_datadir}/doc/%{name}/TODO
 %doc %{_infodir}/*
@@ -156,6 +155,7 @@ fi
 %doc %{_datadir}/doc/%{name}/COPYING.pstdout
 %doc %{_datadir}/doc/%{name}/COPYING.ipmidetect
 %doc %{_datadir}/doc/%{name}/COPYING.ipmi-fru
+%doc %{_datadir}/doc/%{name}/COPYING.ipmi-dcmi
 %doc %{_datadir}/doc/%{name}/COPYING.ZRESEARCH
 %doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmiping
 %doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmipower
@@ -165,6 +165,7 @@ fi
 %doc %{_datadir}/doc/%{name}/DISCLAIMER.pstdout
 %doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmidetect
 %doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmi-fru
+%doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmi-dcmi
 %doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmiping.UC
 %doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmipower.UC
 %doc %{_datadir}/doc/%{name}/DISCLAIMER.rmcpping.UC
@@ -176,7 +177,9 @@ fi
 %doc %{_datadir}/doc/%{name}/freeipmi-coding.txt
 %doc %{_datadir}/doc/%{name}/freeipmi-hostrange.txt
 %doc %{_datadir}/doc/%{name}/freeipmi-libraries.txt
-%doc %{_datadir}/doc/%{name}/freeipmi-bugs-and-workarounds.txt
+%doc %{_datadir}/doc/%{name}/freeipmi-bugs-issues-and-workarounds.txt
+%doc %{_datadir}/doc/%{name}/freeipmi-testing.txt
+%doc %{_datadir}/doc/%{name}/freeipmi-oem-documentation-requirements.txt
 %dir %{_datadir}/doc/%{name}
 %{_libdir}/libipmiconsole*so.*
 %{_libdir}/libfreeipmi*so.*
@@ -188,8 +191,9 @@ fi
 %{_sbindir}/bmc-device
 %{_sbindir}/ipmi-fru
 %{_sbindir}/ipmi-locate
-%{_sbindir}/pef-config
 %{_sbindir}/ipmi-oem
+%{_sbindir}/ipmi-pef-config
+%{_sbindir}/pef-config
 %{_sbindir}/ipmi-raw
 %{_sbindir}/ipmi-sel
 %{_sbindir}/ipmi-sensors
@@ -201,6 +205,7 @@ fi
 %{_sbindir}/ipmimonitoring
 %{_sbindir}/ipmi-chassis
 %{_sbindir}/ipmi-chassis-config
+%{_sbindir}/ipmi-dcmi
 %{_sbindir}/ipmidetect
 %{_mandir}/man8/bmc-config.8*
 %{_mandir}/man5/bmc-config.conf.5*
@@ -208,8 +213,9 @@ fi
 %{_mandir}/man8/bmc-device.8*
 %{_mandir}/man8/ipmi-fru.8*
 %{_mandir}/man8/ipmi-locate.8*
-%{_mandir}/man8/pef-config.8*
 %{_mandir}/man8/ipmi-oem.8*
+%{_mandir}/man8/ipmi-pef-config.8*
+%{_mandir}/man8/pef-config.8*
 %{_mandir}/man8/ipmi-raw.8*
 %{_mandir}/man8/ipmi-sel.8*
 %{_mandir}/man8/ipmi-sensors.8*
@@ -227,12 +233,12 @@ fi
 %{_mandir}/man5/libipmimonitoring.conf.5*
 %{_mandir}/man8/ipmi-chassis.8*
 %{_mandir}/man8/ipmi-chassis-config.8*
+%{_mandir}/man8/ipmi-dcmi.8*
 %{_mandir}/man8/ipmidetect.8*
 %{_mandir}/man5/freeipmi.conf.5*
 %{_mandir}/man5/ipmidetect.conf.5*
 %{_mandir}/man7/freeipmi.7*
 %dir %{_localstatedir}/cache/ipmimonitoringsdrcache
-%dir %{_localstatedir}/log/ipmiconsole
 
 %files devel
 %defattr(-,root,root)
@@ -246,11 +252,16 @@ fi
 %dir %{_includedir}/freeipmi/debug
 %dir %{_includedir}/freeipmi/driver
 %dir %{_includedir}/freeipmi/fiid
+%dir %{_includedir}/freeipmi/fru-parse
 %dir %{_includedir}/freeipmi/interface
 %dir %{_includedir}/freeipmi/locate
 %dir %{_includedir}/freeipmi/record-format
 %dir %{_includedir}/freeipmi/sdr-cache
+%dir %{_includedir}/freeipmi/sdr-parse
+%dir %{_includedir}/freeipmi/sel-parse
+%dir %{_includedir}/freeipmi/sensor-read
 %dir %{_includedir}/freeipmi/spec
+%dir %{_includedir}/freeipmi/templates
 %dir %{_includedir}/freeipmi/util
 %{_includedir}/ipmiconsole.h
 %{_includedir}/ipmidetect.h
@@ -261,11 +272,16 @@ fi
 %{_includedir}/freeipmi/debug/*.h
 %{_includedir}/freeipmi/driver/*.h
 %{_includedir}/freeipmi/fiid/*.h
+%{_includedir}/freeipmi/fru-parse/*.h
 %{_includedir}/freeipmi/interface/*.h
 %{_includedir}/freeipmi/locate/*.h
 %{_includedir}/freeipmi/record-format/*.h
 %{_includedir}/freeipmi/sdr-cache/*.h
+%{_includedir}/freeipmi/sdr-parse/*.h
+%{_includedir}/freeipmi/sel-parse/*.h
+%{_includedir}/freeipmi/sensor-read/*.h
 %{_includedir}/freeipmi/spec/*.h
+%{_includedir}/freeipmi/templates/*.h
 %{_includedir}/freeipmi/util/*.h
 %{_mandir}/man3/*
 
@@ -274,21 +290,25 @@ fi
 %doc %{_datadir}/doc/%{name}/COPYING.bmc-watchdog
 %doc %{_datadir}/doc/%{name}/DISCLAIMER.bmc-watchdog
 %doc %{_datadir}/doc/%{name}/DISCLAIMER.bmc-watchdog.UC
-%{_initrddir}/freeipmi-bmc-watchdog
-%config(noreplace) %{_sysconfdir}/sysconfig/freeipmi-bmc-watchdog
-%config(noreplace) %{_sysconfdir}/logrotate.d/freeipmi-bmc-watchdog
+%{_initrddir}/bmc-watchdog
+%config(noreplace) %{_sysconfdir}/sysconfig/bmc-watchdog
+%config(noreplace) %{_sysconfdir}/logrotate.d/bmc-watchdog
 %{_sbindir}/bmc-watchdog
 %{_mandir}/man8/bmc-watchdog.8*
 %dir %{_localstatedir}/log/freeipmi
 
 %files ipmidetectd
 %defattr(-,root,root)
-%{_initrddir}/freeipmi-ipmidetectd
+%{_initrddir}/ipmidetectd
+%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ipmidetectd.conf
 %{_sbindir}/ipmidetectd
 %{_mandir}/man5/ipmidetectd.conf.5*
 %{_mandir}/man8/ipmidetectd.8*
 
 %changelog
+* Thu Jan  7 2010 Jan Safranek <jsafrane@redhat.com> - 0.8.2-1
+- Update to freeipmi-0.8.2
+
 * Tue Dec  1 2009 Jan Safranek <jsafrane@redhat.com> - 0.7.16-1
 - Update to freeipmi-0.7.16
 
diff --git a/sources b/sources
index ebee12c..6a713b1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8c4349ac302951d6cb2c896f28c6d7b9  freeipmi-0.7.16.tar.gz
+d8cad04b776177fa29d023126ed3f4a3  freeipmi-0.8.2.tar.gz