--- a/components/ipmitool/ipmievd.8	Tue Aug 14 11:03:16 2012 -0700
+++ b/components/ipmitool/ipmievd.8	Tue Aug 14 17:53:54 2012 -0700
@@ -20,7 +20,7 @@
 .\" CDDL HEADER END
 .\"
 .\"
-.\" Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
 .\"
 .\" ipmievd man page
 .\"
@@ -29,9 +29,7 @@
 ipmievd \- IPMI event daemon for sending events to syslog
 .SH "SYNOPSIS"
 ipmievd [\fB\-c\fR|\fB\-h\fR|\fB\-d \fIN\fP\fR|\fB\-v\fR|\fB\-V\fR]
-\fB\-I\fR \fIopen\fP <\fIopen\fR | \fIsel\fR> [<\fIoption\fP>]
-
-Note: Use -I open on linux, use -I bmc on solaris
+\fB\-I\fR \fIbmc\fP \fIsel\fP [<\fIoption\fP>]
 
 ipmievd [\fB\-c\fR|\fB\-h\fR|\fB\-v\fR|\fB\-V\fR]
 \fB\-I\fR \fIlan\fP \fB\-H\fR <\fIhostname\fP>
@@ -124,6 +122,7 @@
 
 .TS
 tab(+);
+l l .
 bmc+IPMI v2.0 BMC interface [default]
 lan+IPMI v1.5 LAN Interface
 lanplus+IPMI v2.0 RMCP+ LAN Interface
@@ -231,16 +230,16 @@
 .br 
 Waiting for Events...
 .SH "FILES"
-\fB/platform/i86pc/kernel/drv/bmc\fR
+\fB/kernel/drv/amd64//bmc\fR
 .in +30n
 .sp
-32-bit \fBELF\fR kernel module for the bmc driver.
+x86 \fBELF\fR kernel module for the bmc driver.
 .sp
 .in -30n
-\fB/platform/i86pc/kernel/drv/amd64/bmc\fR
+\fB/platform/sun4v/kernel/drv/sparcv9/bmc\fR
 .in +30n
 .sp
-64-bit \fBELF\fR kernel module for the bmc driver.
+sparc \fBELF\fR kernel module for the bmc driver.
 .in -30n
 \fB/dev/bmc\fR
 .in +30n

--- a/components/ipmitool/ipmitool.1m	Tue Aug 14 11:03:16 2012 -0700
+++ b/components/ipmitool/ipmitool.1m	Tue Aug 14 17:53:54 2012 -0700
@@ -1,4 +1,4 @@
-'\" t
+'\" 
 .\"
 .\" CDDL HEADER START
 .\"
@@ -19,7 +19,7 @@
 .\"
 .\" CDDL HEADER END
 .\"
-.\" Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
 .\"
 .TH ipmitool 1m "07 November 2011"
 .SH NAME
@@ -2209,16 +2209,16 @@
 	
 .SH FILES
 
-\fB/platform/i86pc/kernel/drv/bmc\fR
+\fB/kernel/drv/amd64//bmc\fR
 .in +30n
 .sp
-32-bit \fBELF\fR kernel module for the bmc driver.
+x86 \fBELF\fR kernel module for the bmc driver.
 .sp
 .in -30n
-\fB/platform/i86pc/kernel/drv/amd64/bmc\fR
+\fB/platform/sun4v/kernel/drv/sparcv9/bmc\fR
 .in +30n
 .sp
-64-bit \fBELF\fR kernel module for the bmc driver.
+sparc \fBELF\fR kernel module for the bmc driver.
 .in -30n
 \fB/dev/bmc\fR
 .in +30n

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ipmitool/patches/7183093.patch	Tue Aug 14 17:53:54 2012 -0700
@@ -0,0 +1,22 @@
+--- ipmitool-1.8.11/src/plugins/ipmi_intf.c	Mon Jul 30 16:02:31 2012
++++ ipmitool-1.8.11/src/plugins/ipmi_intf.c	Mon Jul 30 16:02:51 2012
+@@ -64,6 +64,9 @@
+ #endif
+ 
+ struct ipmi_intf * ipmi_intf_table[] = {
++#ifdef IPMI_INTF_BMC
++	&ipmi_bmc_intf,
++#endif
+ #ifdef IPMI_INTF_OPEN
+ 	&ipmi_open_intf,
+ #endif
+@@ -73,9 +76,6 @@
+ #ifdef IPMI_INTF_LIPMI
+ 	&ipmi_lipmi_intf,
+ #endif
+-#ifdef IPMI_INTF_BMC
+-	&ipmi_bmc_intf,
+-#endif
+ #ifdef IPMI_INTF_LAN
+ 	&ipmi_lan_intf,
+ #endif

--- a/components/ipmitool/svc-ipmievd	Tue Aug 14 11:03:16 2012 -0700
+++ b/components/ipmitool/svc-ipmievd	Tue Aug 14 17:53:54 2012 -0700
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 # These are the SMF start/stop/restart methods for ipmievd.
@@ -52,7 +52,7 @@
 			exit $SMF_EXIT_OK
 		fi
 
-		/usr/lib/ipmievd sel
+		/usr/lib/ipmievd -I bmc sel
 		[ $? -ne 0 ] && exit 1
 		;;