diff --git a/SOURCES/0016-ipmitool-1.8.18-verbose.patch b/SOURCES/0016-ipmitool-1.8.18-verbose.patch
new file mode 100644
index 0000000..6c7bdb6
--- /dev/null
+++ b/SOURCES/0016-ipmitool-1.8.18-verbose.patch
@@ -0,0 +1,110 @@
+diff -urNp old/lib/ipmi_picmg.c new/lib/ipmi_picmg.c
+--- old/lib/ipmi_picmg.c	2016-07-31 07:29:49.000000000 +0200
++++ new/lib/ipmi_picmg.c	2017-10-03 15:38:48.711790645 +0200
+@@ -2353,28 +2353,28 @@ picmg_discover(struct ipmi_intf *intf) {
+ 	req.msg.data_len = 1;
+ 	msg_data = 0;
+ 
+-	lprintf(LOG_INFO, "Running Get PICMG Properties my_addr %#x, transit %#x, target %#x",
++	lprintf(LOG_DEBUG, "Running Get PICMG Properties my_addr %#x, transit %#x, target %#x",
+ 		intf->my_addr, intf->transit_addr, intf->target_addr);
+ 	rsp = intf->sendrecv(intf, &req);
+ 	if (rsp == NULL) {
+-	    lprintf(LOG_INFO,"No response from Get PICMG Properties");
++	    lprintf(LOG_DEBUG,"No response from Get PICMG Properties");
+ 	} else if (rsp->ccode != 0) {
+-	    lprintf(LOG_INFO,"Error response %#x from Get PICMG Properities",
++	    lprintf(LOG_DEBUG,"Error response %#x from Get PICMG Properities",
+ 		    rsp->ccode);
+ 	} else if (rsp->data_len < 4) {
+-	    lprintf(LOG_INFO,"Invalid Get PICMG Properties response length %d",
++	    lprintf(LOG_DEBUG,"Invalid Get PICMG Properties response length %d",
+ 		    rsp->data_len);
+ 	} else if (rsp->data[0] != 0) {
+-	    lprintf(LOG_INFO,"Invalid Get PICMG Properties group extension %#x",
++	    lprintf(LOG_DEBUG,"Invalid Get PICMG Properties group extension %#x",
+ 		    rsp->data[0]);
+ 	} else if ((rsp->data[1] & 0x0F) != PICMG_EXTENSION_ATCA_MAJOR_VERSION
+ 		&& (rsp->data[1] & 0x0F) != PICMG_EXTENSION_AMC0_MAJOR_VERSION
+ 		&& (rsp->data[1] & 0x0F) != PICMG_EXTENSION_UTCA_MAJOR_VERSION) {
+-	    lprintf(LOG_INFO,"Unknown PICMG Extension Version %d.%d",
++	    lprintf(LOG_DEBUG,"Unknown PICMG Extension Version %d.%d",
+ 		    (rsp->data[1] & 0x0F), (rsp->data[1] >> 4));
+ 	} else {
+ 	    picmg_avail = 1;
+-	    lprintf(LOG_INFO, "Discovered PICMG Extension Version %d.%d",
++	    lprintf(LOG_DEBUG, "Discovered PICMG Extension Version %d.%d",
+ 		    (rsp->data[1] & 0x0f), (rsp->data[1] >> 4));
+ 	}
+ 
+diff -urNp old/lib/ipmi_vita.c new/lib/ipmi_vita.c
+--- old/lib/ipmi_vita.c	2018-01-05 10:29:51.290694252 +0100
++++ new/lib/ipmi_vita.c	2018-01-05 12:09:56.480413217 +0100
+@@ -184,7 +184,7 @@ vita_discover(struct ipmi_intf *intf)
+ 
+ 	msg_data = GROUP_EXT_VITA;
+ 
+-	lprintf(LOG_INFO, "Running Get VSO Capabilities my_addr %#x, "
++	lprintf(LOG_DEBUG, "Running Get VSO Capabilities my_addr %#x, "
+ 		"transit %#x, target %#x",
+ 		intf->my_addr, intf->transit_addr, intf->target_addr);
+ 
+@@ -193,29 +193,29 @@ vita_discover(struct ipmi_intf *intf)
+ 	if (rsp == NULL) {
+ 		lprintf(LOG_ERR, "No valid response received");
+ 	} else if (rsp->ccode == 0xC1) {
+-		lprintf(LOG_INFO, "Invalid completion code received: %s",
++		lprintf(LOG_DEBUG, "Invalid completion code received: %s",
+ 			val2str(rsp->ccode, completion_code_vals));
+ 	} else if (rsp->ccode == 0xCC) {
+-		lprintf(LOG_INFO, "Invalid data field received: %s",
++		lprintf(LOG_DEBUG, "Invalid data field received: %s",
+ 			val2str(rsp->ccode, completion_code_vals));
+ 	} else if (rsp->ccode != 0) {
+-		lprintf(LOG_INFO, "Invalid completion code received: %s",
++		lprintf(LOG_DEBUG, "Invalid completion code received: %s",
+ 			val2str(rsp->ccode, completion_code_vals));
+ 	} else if (rsp->data_len < 5) {
+-		lprintf(LOG_INFO, "Invalid response length %d",
++		lprintf(LOG_DEBUG, "Invalid response length %d",
+ 			rsp->data_len);
+ 	} else if (rsp->data[0] != GROUP_EXT_VITA) {
+-		lprintf(LOG_INFO, "Invalid group extension %#x",
++		lprintf(LOG_DEBUG, "Invalid group extension %#x",
+ 			rsp->data[0]);
+ 	} else if ((rsp->data[3] & 0x03) != 0) {
+-		lprintf(LOG_INFO, "Unknown VSO Standard %d",
++		lprintf(LOG_DEBUG, "Unknown VSO Standard %d",
+ 			(rsp->data[3] & 0x03));
+ 	} else if ((rsp->data[4] & 0x0F) != 1) {
+-		lprintf(LOG_INFO, "Unknown VSO Specification Revision %d.%d",
++		lprintf(LOG_DEBUG, "Unknown VSO Specification Revision %d.%d",
+ 			(rsp->data[4] & 0x0F), (rsp->data[4] >> 4));
+ 	} else {
+ 		vita_avail = 1;
+-		lprintf(LOG_INFO, "Discovered VITA 46.11 Revision %d.%d",
++		lprintf(LOG_DEBUG, "Discovered VITA 46.11 Revision %d.%d",
+ 			(rsp->data[4] & 0x0F), (rsp->data[4] >> 4));
+ 	}
+ 
+diff -urNp old/lib/ipmi_main.c new/lib/ipmi_main.c
+--- old/lib/ipmi_main.c	2018-01-08 15:31:37.159786062 +0100
++++ new/lib/ipmi_main.c	2018-01-08 15:32:35.960077134 +0100
+@@ -904,7 +904,7 @@ ipmi_main(int argc, char ** argv,
+ 	} else if (!ipmi_oem_active(ipmi_main_intf, "i82571spt")) {
+ 		lprintf(LOG_DEBUG, "Acquire IPMB address");
+ 		addr = ipmi_acquire_ipmb_address(ipmi_main_intf);
+-		lprintf(LOG_INFO,  "Discovered IPMB address 0x%x", addr);
++		lprintf(LOG_DEBUG,  "Discovered IPMB address 0x%x", addr);
+ 	}
+ 
+ 	/*
+@@ -956,7 +956,7 @@ ipmi_main(int argc, char ** argv,
+ 					   ipmi_main_intf->transit_addr,
+ 					   ipmi_main_intf->transit_channel);
+ 		if (ipmi_main_intf->target_ipmb_addr) {
+-			lprintf(LOG_INFO, "Discovered Target IPMB-0 address %#x",
++			lprintf(LOG_DEBUG, "Discovered Target IPMB-0 address %#x",
+ 					   ipmi_main_intf->target_ipmb_addr);
+ 		}
+ 	}
diff --git a/SOURCES/0017-ipmitool-1.8.18-check-input-values.patch b/SOURCES/0017-ipmitool-1.8.18-check-input-values.patch
new file mode 100644
index 0000000..030fd2a
--- /dev/null
+++ b/SOURCES/0017-ipmitool-1.8.18-check-input-values.patch
@@ -0,0 +1,41 @@
+diff -urNp old/doc/ipmitool.1 new/doc/ipmitool.1
+--- old/doc/ipmitool.1	2017-10-03 16:10:50.446539988 +0200
++++ new/doc/ipmitool.1	2017-10-03 16:16:37.039673239 +0200
+@@ -3170,13 +3170,14 @@ SOL configuration data for the currently
+ 
+ Enable, disable or show status of SOL payload for the user on the specified channel. 
+ .TP 
+-\fIset\fP <\fBparameter\fR> <\fBvalue\fR> [<\fBchannel\fR>]
++\fIset\fP <\fBparameter\fR> <\fBvalue\fR> [<\fBchannel\fR>] [\fBnoguard\fR]
+ .br 
+ 
+ Configure parameters for Serial Over Lan.  If no channel is given,
+ it will display SOL configuration data for the currently used
+ channel.  Configuration parameter updates are automatically guarded
+-with the updates to the set\-in\-progress parameter.
++with the updates to the set\-in\-progress parameter, unless \fInoguard\fR
++parameter is present.
+ .RS
+ .TP 
+ Valid parameters and values are:
+diff -urNp old/lib/ipmi_sol.c new/lib/ipmi_sol.c
+--- old/lib/ipmi_sol.c	2017-10-03 16:10:50.447539996 +0200
++++ new/lib/ipmi_sol.c	2017-10-03 16:18:37.079006949 +0200
+@@ -1875,7 +1875,7 @@ static void
+ print_sol_usage(void)
+ {
+ 	lprintf(LOG_NOTICE, "SOL Commands: info [<channel number>]");
+-	lprintf(LOG_NOTICE, "              set <parameter> <value> [channel]");
++	lprintf(LOG_NOTICE, "              set <parameter> <value> [channel] [noguard]");
+ 	lprintf(LOG_NOTICE, "              payload <enable|disable|status> [channel] [userid]");
+ 	lprintf(LOG_NOTICE, "              activate [<usesolkeepalive|nokeepalive>] [instance=<number>]");
+ 	lprintf(LOG_NOTICE, "              deactivate [instance=<number>]");
+@@ -1890,6 +1890,8 @@ print_sol_usage(void)
+ static void
+ print_sol_set_usage(void)
+ {
++	lprintf(LOG_NOTICE, "\nSOL set usage: \n");
++	lprintf(LOG_NOTICE, "  sol set <parameter> <value> [channel] [noguard]\n");
+ 	lprintf(LOG_NOTICE, "\nSOL set parameters and values: \n");
+   	lprintf(LOG_NOTICE, "  set-in-progress             set-complete | "
+ 		"set-in-progress | commit-write");
diff --git a/SPECS/ipmitool.spec b/SPECS/ipmitool.spec
index 4510c7a..3d4c05c 100644
--- a/SPECS/ipmitool.spec
+++ b/SPECS/ipmitool.spec
@@ -3,7 +3,7 @@
 Name:         ipmitool
 Summary:      Utility for IPMI control
 Version:      1.8.18
-Release:      5%{?dist}
+Release:      7%{?dist}
 License:      BSD
 Group:        System Environment/Base
 URL:          http://ipmitool.sourceforge.net/
@@ -34,6 +34,9 @@ Patch7:  0007-ipmitool-1.8.11-remove-umask0.patch.patch
 Patch9:  0009-ipmitool-1.8.11-bz1126333-slowswid.patch.patch
 Patch10: 0010-ipmitool-1.8.11-bz878614-overname.patch.patch
 Patch15: 0015-ID-390-Support-for-new-Communication-Interface-USB-M.patch
+Patch16: 0016-ipmitool-1.8.18-verbose.patch
+Patch17: 0017-ipmitool-1.8.18-check-input-values.patch
+
 
 %description
 This package contains a utility for interfacing with devices that support
@@ -90,6 +93,8 @@ for the host OS to use.
 %patch9 -p1
 %patch10 -p1
 %patch15 -p1
+%patch16 -p1
+%patch17 -p1
 
 for f in AUTHORS ChangeLog; do
     iconv -f iso-8859-1 -t utf8 < ${f} > ${f}.utf8
@@ -181,6 +186,13 @@ install -Dm 755 contrib/bmc-snmp-proxy         %{buildroot}%{_libexecdir}/bmc-sn
 %{_libexecdir}/bmc-snmp-proxy
 
 %changelog
+* Tue Feb 06 2018 Josef Ridky <jridky@redhat.com> - 0:1.8.18-7
+- Remove debug prints shown without -v option (#1483163)
+
+* Tue Oct 03 2017 Josef Ridky <jridky@redhat.com> - 0:1.8.18-6
+- Hide unrequested verbose output (#1483163)
+- Fix doc for check input values (#1495098)
+
 * Mon Apr 10 2017 Josef Ridky <jridky@redhat.com> - 0:1.8.18-5
 - Remove RPMDiff fix file (#1439269) related to #1398658