diff --git a/ipmitool/bldipmi.pl b/ipmitool/bldipmi.pl
index c542c4b..4b5517d 100755
--- a/ipmitool/bldipmi.pl
+++ b/ipmitool/bldipmi.pl
@@ -1,5 +1,7 @@
 #! /usr/bin/perl
 
+my $version = "1.8.18";
+
 #check the distro
 $cmd = "cat /etc/*release";
 @output = `$cmd`;
@@ -37,7 +39,6 @@ if ( ! grep /openssl-devel|libopenssl/, @output ) {
 
 # check the source files
 my $pwd = `pwd`;
-my $version = "1.8.17";
 chomp($pwd);
 if ( (! -f "$pwd/ipmitool-$version.tar.gz")
   || (! -f "$pwd/ipmitool.spec")
diff --git a/ipmitool/debian/changelog b/ipmitool/debian/changelog
index 880d0a8..818f9d6 100644
--- a/ipmitool/debian/changelog
+++ b/ipmitool/debian/changelog
@@ -1,3 +1,8 @@
+ipmitool-xcat (1.8.18) unstable; urgency=low
+  * Upgrade to 1.8.18 version
+
+ -- Victor Hu <vhu@us.ibm.com> Tue, May 30, 2017 14:41:01 -0400
+
 ipmitool-xcat (1.8.17-1) unstable; urgency=low
   * Make ipmitool exit gracefully when receiving `INT`, `TERM` or `HUP` signal.
   * Close the intf(lanplus) session when the sol session at BMC side is closed.
diff --git a/ipmitool/debian/patches/series b/ipmitool/debian/patches/series
index c4b5f52..118679f 100644
--- a/ipmitool/debian/patches/series
+++ b/ipmitool/debian/patches/series
@@ -1,3 +1,3 @@
-ipmitool-1.8.17-saneretry.patch
-ipmitool-1.8.17-rflash.patch
-ipmitool-1.8.17-signal.patch
+ipmitool-1.8.18-saneretry.patch
+ipmitool-1.8.18-rflash.patch
+ipmitool-1.8.18-signal.patch
diff --git a/ipmitool/ipmitool.spec b/ipmitool/ipmitool.spec
index 78cd6ff..8136dd9 100644
--- a/ipmitool/ipmitool.spec
+++ b/ipmitool/ipmitool.spec
@@ -1,6 +1,6 @@
 Name:         ipmitool-xcat
 Summary:      ipmitool - Utility for IPMI control
-Version:      1.8.17
+Version:      1.8.18
 Release:      1
 License:      BSD
 Group:        Utilities
@@ -64,6 +64,8 @@ fi
 
 
 %changelog
+* Tue May 30 2017 <vhu@us.im.com> 1.8.18
+  Added support for building ipmitool-xcat 1.8.18 and forward fit patches
 * Wed Nov 04 2016 <chenglch@cn.ibm.com> 1.8.17-1
   Make ipmitool exit gracefully when receiving `INT`, `TERM` or `HUP` signal.
   Close the intf(lanplus) session when the sol session at BMC side is closed.
diff --git a/ipmitool/make_deb.sh b/ipmitool/make_deb.sh
index ba3bcfc..cc74b9c 100755
--- a/ipmitool/make_deb.sh
+++ b/ipmitool/make_deb.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-VERSION=1.8.17
+VERSION=1.8.18
 
 tar xvfz ipmitool-$VERSION.tar.gz
 cd ipmitool-$VERSION