diff --git a/ipmiutil-2.8.2.tar.gz b/ipmiutil-2.8.2.tar.gz
deleted file mode 100644
index f4b6f4b..0000000
--- a/ipmiutil-2.8.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:16f2181745030ae1e7110bf0c780760d4b2de0a47f9945c9a52314e4ef520988
-size 1591876
diff --git a/ipmiutil-2.8.4.tar.gz b/ipmiutil-2.8.4.tar.gz
new file mode 100644
index 0000000..b456f0e
--- /dev/null
+++ b/ipmiutil-2.8.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a4d05790952118003a697e53e672b52a8c80d647cd40a6ae3679beaf472f7640
+size 1613630
diff --git a/ipmiutil-2.8.5.tar.gz b/ipmiutil-2.8.5.tar.gz
new file mode 100644
index 0000000..4e5c071
--- /dev/null
+++ b/ipmiutil-2.8.5.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6846e6621b9df23b1ed37662c075381dbb082f3e719803c9ef8784dd3154439c
+size 1615967
diff --git a/ipmiutil.changes b/ipmiutil.changes
index ada879d..95e1309 100644
--- a/ipmiutil.changes
+++ b/ipmiutil.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Fri Aug 24 20:17:25 UTC 2012 - arcress@users.sourceforge.net
+
+- update to upstream ipmiutil-2.8.5
+
+-------------------------------------------------------------------
+Tue Jun 26 13:30:25 UTC 2012 - arcress@users.sourceforge.net
+
+- do rebuild for F15 build enviromnent issue (see #766927)
+
+-------------------------------------------------------------------
+Wed Jun 13 16:13:19 UTC 2012 - arcress@users.sourceforge.net
+
+- update to upstream ipmiutil-2.8.4
+
 -------------------------------------------------------------------
 Fri Mar 23 08:37:43 UTC 2012 - cfarrell@suse.com
 
diff --git a/ipmiutil.spec b/ipmiutil.spec
index 4aeabd0..310bbb3 100644
--- a/ipmiutil.spec
+++ b/ipmiutil.spec
@@ -19,7 +19,7 @@
 
 
 Name:           ipmiutil
-Version:        2.8.2
+Version:        2.8.5
 Release:        1%{?dist}
 Summary:        Easy-to-use IPMI server management utilities
 License:        BSD-3-Clause
@@ -33,12 +33,10 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?req_systemd}
 BuildRequires:  gcc gcc-c++ libtool openssl-devel systemd
 %define systemd_fls %{_unitdir}
-# Requires: %{?systemd_requires}
 %else
 BuildRequires:  gcc gcc-c++ libtool openssl-devel
 %define systemd_fls %{_datadir}/%{name}
 %endif
-# Suggests: cron or vixie-cron or cronie or similar
 
 %define init_dir  %{_initrddir}
 
@@ -153,7 +151,7 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root)
-%{_datadir}/%{name}/ipmicmd.h
+%{_includedir}/ipmicmd.h
 %{_datadir}/%{name}/ipmi_sample.c
 %{_datadir}/%{name}/Makefile
 %{_libdir}/libipmiutil.a
@@ -206,7 +204,9 @@ then
       fi
       # IPMI_IS_ENABLED, so enable services, but only if Red Hat
       if [ -f /etc/redhat-release ]; then
-         if [ -x /sbin/chkconfig ]; then
+         if [ -x /bin/systemctl ]; then
+            touch ${scr_dir}/ipmi_port.service
+         elif [ -x /sbin/chkconfig ]; then
             /sbin/chkconfig --add ipmi_port
             /sbin/chkconfig --add ipmiutil_wdt
             /sbin/chkconfig --add ipmiutil_asy 
@@ -242,23 +242,13 @@ then
      /sbin/chkconfig --del ipmiutil_evt >/dev/null 2>&1
    fi
    if [ -x /bin/systemctl ]; then
-     systemd_dir=%{_unitdir}
-     if [ -f ${systemd_dir}/ipmiutil_evt.service ]; then
+     if [ -f %{_unitdir}/ipmiutil_evt.service ]; then
 	systemctl disable ipmi_port.service >/dev/null 2>&1 || :
 	systemctl stop ipmiutil_evt.service >/dev/null 2>&1 || :
 	systemctl stop ipmiutil_asy.service >/dev/null 2>&1 || :
 	systemctl stop ipmiutil_wdt.service >/dev/null 2>&1 || :
 	systemctl stop ipmi_port.service    >/dev/null 2>&1 || :
-	rm -f ${systemd_dir}/ipmiutil_evt.service 
-	rm -f ${systemd_dir}/ipmiutil_asy.service 
-	rm -f ${systemd_dir}/ipmiutil_wdt.service 
-	rm -f ${systemd_dir}/ipmi_port.service    
      fi
-   else 
-	rm -f %{init_dir}/ipmiutil_wdt 2>/dev/null
-	rm -f %{init_dir}/ipmiutil_asy 2>/dev/null
-	rm -f %{init_dir}/ipmiutil_evt 2>/dev/null
-	rm -f %{init_dir}/ipmi_port    2>/dev/null
    fi
 %endif
    if [ -f %{_sysconfdir}/cron.daily/checksel ]; then
@@ -273,9 +263,19 @@ fi
 if [ -x /bin/systemctl ]; then
    systemctl daemon-reload  || :
    if [ $1 -ge 1 ] ; then
-      # Package upgrade, not uninstall
-      systemctl try-restart ipmi_port.service  || :
+	# Package upgrade, not uninstall
+	systemctl try-restart ipmi_port.service  || :
    fi
+	systemd_dir=%{_unitdir}
+	rm -f ${systemd_dir}/ipmiutil_evt.service 2>/dev/null
+	rm -f ${systemd_dir}/ipmiutil_asy.service 2>/dev/null
+	rm -f ${systemd_dir}/ipmiutil_wdt.service 2>/dev/null
+	rm -f ${systemd_dir}/ipmi_port.service    2>/dev/null
+else 
+	rm -f %{init_dir}/ipmiutil_wdt 2>/dev/null
+	rm -f %{init_dir}/ipmiutil_asy 2>/dev/null
+	rm -f %{init_dir}/ipmiutil_evt 2>/dev/null
+	rm -f %{init_dir}/ipmi_port    2>/dev/null
 fi
 %endif
 
diff --git a/oem_dell-void.patch b/oem_dell-void.patch
new file mode 100644
index 0000000..21e5b6e
--- /dev/null
+++ b/oem_dell-void.patch
@@ -0,0 +1,10 @@
+--- a/util/oem_dell.c	2012-06-13 12:03:40.000000000 -0400
++++ b/util/oem_dell.c	2012-06-13 11:16:41.000000000 -0400
+@@ -4974,6 +4974,7 @@
+     lprintf(LOG_NOTICE, "");
+ }
+ 
++static void
+ ipmi_delloem_getled_usage(void)
+ {
+     lprintf(LOG_NOTICE, "");