diff --git a/ipmitool-1.8.15.tar.bz2 b/ipmitool-1.8.15.tar.bz2
index 1d3f4c1..952adcb 100644
--- a/ipmitool-1.8.15.tar.bz2
+++ b/ipmitool-1.8.15.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:130d452916a85c00ef827498e4a86ac9b4a123e22624b59360dffb0426aae988
-size 435535
+oid sha256:4acd2df5f8740fef5c032cebee0113ec4d3bbef04a6f4dbfaf7fcc7f3eb08c40
+size 747174
diff --git a/ipmitool.changes b/ipmitool.changes
index 7eee2d0..8fe116a 100644
--- a/ipmitool.changes
+++ b/ipmitool.changes
@@ -5,6 +5,8 @@ Thu Jan 15 13:56:40 UTC 2015 - trenn@suse.de
   This is version 1.8.15 (git tag: IPMITOOL_1_8_15) plus mainline patches up
   to commit 708be8bc450f907cddb6d9e4b83aee6ba67b7d04
   Date:   Fri Jan 9 12:48:35 2015 +0100
+* Add: latest_compile_fixes.patch
+* Add: ipmitool-1_8_15_HEAD.patch
 
 -------------------------------------------------------------------
 Thu Mar  6 11:50:59 UTC 2014 - trenn@suse.de
diff --git a/ipmitool.spec b/ipmitool.spec
index c7340f0..36b20cc 100644
--- a/ipmitool.spec
+++ b/ipmitool.spec
@@ -36,11 +36,10 @@ Patch1:         ipmitool-1_8_15_HEAD.patch
 Patch3:         fwum_enhance_output.patch
 Patch6:         fix_file_permissions.patch
 Patch8:         several_more_compile_fixes.patch
-Patch9:         automake-1.13.patch
-Patch10:        ipmitool_adjust_suse.paths
-Patch11:        0001-Incorporate-upstream-comments-to-289-add-whitespace.patch
-Patch12:        ipmitool-1.8.10-implicit-fortify-decl.patch
-Patch13:        latest_compile_fixes.patch
+Patch9:        ipmitool_adjust_suse.paths
+Patch10:        0001-Incorporate-upstream-comments-to-289-add-whitespace.patch
+Patch11:        ipmitool-1.8.10-implicit-fortify-decl.patch
+Patch12:        latest_compile_fixes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # bmc-snmp-proxy needs /usr/sbin/snmpd
 Requires:       net-snmp
@@ -73,9 +72,8 @@ and setting LAN configuration, and chassis power control.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-%patch11 -p1
-%patch12 -p0
-%patch13 -p1
+%patch11 -p0
+%patch12 -p1
 
 %build
 touch INSTALL NEWS
@@ -92,18 +90,18 @@ install -D -m 0755 contrib/exchange-bmc-os-info.init.redhat "$RPM_BUILD_ROOT\
 "/%{_sbindir}/exchange-bmc-os-info
 install -D -m 0644 contrib/exchange-bmc-os-info.service.redhat "$RPM_BUILD_ROOT"/usr/lib/systemd/system/exchange-bmc-os-info.service
 install -D -m 0644 contrib/exchange-bmc-os-info.sysconf "$RPM_BUILD_ROOT"/%{_sysconfdir}/exchange-bmc-os-info
-#ln -s /etc/init.d/exchange-bmc-os-info $RPM_BUILD_ROOT/%{_sbindir}/rcexchange-bmc-os-info
+ln -sf %_sbindir/service ${RPM_BUILD_ROOT}%{_sbindir}/rcexchange-bmc-os-info
 
 # ipmievd service
 install -D -m 644 %{S:1} "$RPM_BUILD_ROOT"/usr/lib/systemd/system/ipmievd.service
 install -D -m 644 %{S:2} "$RPM_BUILD_ROOT"/%{_sysconfdir}/ipmievd
-#ln -s %{_sbindir}/ipmievd $RPM_BUILD_ROOT/%{_sbindir}/ipmievd
+ln -sf %_sbindir/service ${RPM_BUILD_ROOT}%{_sbindir}/rcipmievd
 
 # bmc-snmp-proxy
 install -D -m 755 contrib/bmc-snmp-proxy         "$RPM_BUILD_ROOT"/%{_sbindir}/bmc-snmp-proxy
 install -D -m 644 contrib/bmc-snmp-proxy.service "$RPM_BUILD_ROOT"/usr/lib/systemd/system/bmc-snmp-proxy.service
 install -D -m 755 contrib/bmc-snmp-proxy.sysconf "$RPM_BUILD_ROOT"/%{_sysconfdir}/bmc-snmp-proxy
-#ln -s /etc/init.d/bmc-snmp-proxy $RPM_BUILD_ROOT/%{_sbindir}/rcbmc-snmp-proxy
+ln -sf %_sbindir/service ${RPM_BUILD_ROOT}%{_sbindir}/rcbmc-snmp-proxy
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -128,14 +126,15 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/ipmievd
 %attr(755,root,root) %{_sbindir}/exchange-bmc-os-info
 %attr(755,root,root) %{_sbindir}/bmc-snmp-proxy
+%{_sbindir}/rcipmievd
+%{_sbindir}/rcexchange-bmc-os-info
+%{_sbindir}/rcbmc-snmp-proxy
 %config(noreplace) %{_sysconfdir}/exchange-bmc-os-info
 %config(noreplace) %{_sysconfdir}/bmc-snmp-proxy
 %config(noreplace) %{_sysconfdir}/ipmievd
 %{_prefix}/lib/systemd/system/exchange-bmc-os-info.service
 %{_prefix}/lib/systemd/system/ipmievd.service
 %{_prefix}/lib/systemd/system/bmc-snmp-proxy.service
-
-#%{_datadir}/doc/packages/ipmitool/*
 %doc %{_mandir}/man1/*
 %doc %{_mandir}/man8/*
 
diff --git a/sdradd_close_file_handle.patch b/sdradd_close_file_handle.patch
deleted file mode 100644
index 9b8d9b4..0000000
--- a/sdradd_close_file_handle.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-ipmitool-1.8.13/lib/ipmi_sdradd.c ./lib/ipmi_sdradd.c
---- ../orig-ipmitool-1.8.13/lib/ipmi_sdradd.c	2013-10-04 09:06:38.279805998 +0200
-+++ ./lib/ipmi_sdradd.c	2013-10-04 09:08:04.979355617 +0200
-@@ -634,6 +634,7 @@
-       queue->tail->next = sdrr;
-     queue->tail = sdrr;
-   }
-+  close(fd);
-   return rc;
- }
-