diff --git a/sysutils/ipmitool/Makefile b/sysutils/ipmitool/Makefile
index ff3766f74528..0956b047c32d 100644
--- a/sysutils/ipmitool/Makefile
+++ b/sysutils/ipmitool/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ipmitool
 PORTVERSION=	1.8.18
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 
diff --git a/sysutils/ipmitool/files/patch-include_ipmitool_ipmi__hpmfwupg.h b/sysutils/ipmitool/files/patch-include_ipmitool_ipmi__hpmfwupg.h
new file mode 100644
index 000000000000..afe2c78bd123
--- /dev/null
+++ b/sysutils/ipmitool/files/patch-include_ipmitool_ipmi__hpmfwupg.h
@@ -0,0 +1,11 @@
+--- include/ipmitool/ipmi_hpmfwupg.h.orig	2016-06-29 18:01:49 UTC
++++ include/ipmitool/ipmi_hpmfwupg.h
+@@ -800,7 +800,7 @@ typedef struct _VERSIONINFO {
+ 	char descString[HPMFWUPG_DESC_STRING_LENGTH + 1];
+ }VERSIONINFO, *PVERSIONINFO;
+ 
+-VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
++extern VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
+ 
+ #define TARGET_VER (0x01)
+ #define ROLLBACK_VER (0x02)
diff --git a/sysutils/ipmitool/files/patch-src_ipmitool.c b/sysutils/ipmitool/files/patch-src_ipmitool.c
new file mode 100644
index 000000000000..b39684f4a9aa
--- /dev/null
+++ b/sysutils/ipmitool/files/patch-src_ipmitool.c
@@ -0,0 +1,10 @@
+--- src/ipmitool.c.orig	2016-08-21 06:59:27 UTC
++++ src/ipmitool.c
+@@ -79,6 +79,7 @@ extern int ipmi_set_main(struct ipmi_intf * intf, int 
+ extern int ipmi_exec_main(struct ipmi_intf * intf, int argc, char ** argv);
+ extern int ipmi_lan6_main(struct ipmi_intf *intf, int argc, char **argv);
+ 
++VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
+ 
+ int csv_output = 0;
+ int verbose = 0;