diff --git a/ipmitool/bldipmi.pl b/ipmitool/bldipmi.pl
index 7f5c224..55f0e02 100755
--- a/ipmitool/bldipmi.pl
+++ b/ipmitool/bldipmi.pl
@@ -93,7 +93,7 @@ if (! grep /libcrypto.so/, @output) {
   exit 1;
 }
 
-my $objrpm = "$blddir/RPMS/$arch/ipmitool-xcat-$version-1.$arch.rpm";
+my $objrpm = "$blddir/RPMS/$arch/ipmitool-xcat-$version-2.$arch.rpm";
 my $dstdir = "/tmp/build/$os/$arch";
 
 # check the build result
diff --git a/ipmitool/debian/changelog b/ipmitool/debian/changelog
index 35dda17..2eff127 100644
--- a/ipmitool/debian/changelog
+++ b/ipmitool/debian/changelog
@@ -1,7 +1,12 @@
+ipmitool-xcat (1.8.15-2) unstable; urgency=low
+  * To close sol session after no more data get from server side
+
+ -- zhaoertao <ertaozh@cn.ibm.com>  Thu, 30 Jun 2016 13:58:00 +0100
+
 ipmitool-xcat (1.8.15-1) unstable; urgency=low
   * Delete user prompt to upgrade firmware
 
- -- chenglch <chenglch@cn.ibm.com>  Web, 4 Nov 2015 23:08:00 +0100
+ -- chenglch <chenglch@cn.ibm.com>  Wed, 4 Nov 2015 23:08:00 +0100
 
 ipmitool-xcat (1.8.11-1) unstable; urgency=low
   * Changed to ipmitool-xcat
diff --git a/ipmitool/debian/patches/series b/ipmitool/debian/patches/series
index 153671f..5b7dd68 100644
--- a/ipmitool/debian/patches/series
+++ b/ipmitool/debian/patches/series
@@ -1,2 +1,3 @@
 ipmitool-1.8.15-saneretry.patch
 ipmitool-1.8.15-rflash.patch
+ipmitool-1.8.15-solactivate.patch
diff --git a/ipmitool/ipmitool-1.8.15-solactivate.patch b/ipmitool/ipmitool-1.8.15-solactivate.patch
new file mode 100644
index 0000000..ce47873
--- /dev/null
+++ b/ipmitool/ipmitool-1.8.15-solactivate.patch
@@ -0,0 +1,13 @@
+diff -uNr ipmitool-1.8.15/lib/ipmi_sol.c ipmitool-1.8.15-solactivate/lib/ipmi_sol.c
+--- ipmitool-1.8.15/lib/ipmi_sol.c	2014-10-23 15:41:13.000000000 -0400
++++ ipmitool-1.8.15-solactivate/lib/ipmi_sol.c	2016-07-12 03:57:28.418316917 -0400
+@@ -1648,6 +1648,9 @@
+ 				{
+ 					output(rs);
+ 				}
++                                else {
++                                        bShouldExit = bBmcClosedSession = 1;
++                                }
+ 				/*
+ 				 * Should recv_sol come back null, the incoming packet was not ours.
+ 				 * Just fall through, the keepalive logic will determine if
diff --git a/ipmitool/ipmitool.spec b/ipmitool/ipmitool.spec
index 1ef2fc4..9013744 100644
--- a/ipmitool/ipmitool.spec
+++ b/ipmitool/ipmitool.spec
@@ -1,13 +1,14 @@
 Name:         ipmitool-xcat
 Summary:      ipmitool - Utility for IPMI control
 Version:      1.8.15
-Release:      1
+Release:      2
 License:      BSD
 Group:        Utilities
 Packager:     IBM Corp.
 Source:       ipmitool-%{version}.tar.gz
 Patch:        ipmitool-%{version}-saneretry.patch
 Patch2:       ipmitool-%{version}-rflash.patch
+Patch3:       ipmitool-%{version}-solactivate.patch
 Buildroot:    /var/tmp/ipmitool-root
 
 %description
@@ -33,6 +34,7 @@ fi
 %setup -n ipmitool-%{version}
 %patch -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 ./configure --with-kerneldir \