diff --git a/open-iscsi.spec b/open-iscsi.spec
index 3c44a0d..c7250f2 100644
--- a/open-iscsi.spec
+++ b/open-iscsi.spec
@@ -1,22 +1,20 @@
 %define pkgver %(echo %version | tr _ -)
 Name:          open-iscsi
 Epoch:         1
-Version:       2.1.4
+Version:       2.1.8
 Release:       1mamba
 Summary:       A high performance, transport independent, multi-platform implementation of RFC3720
 Group:         System/Kernel and Hardware
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
-URL:           https://www.open-iscsi.org/
+URL:           https://www.open-iscsi.com/
 Source:        https://github.com/open-iscsi/open-iscsi.git/%{version}/open-iscsi-%{version}.tar.bz2
-#Source:        http://www.open-iscsi.org/bits/open-iscsi-%{pkgver}.tar.gz
 Source1:       open-iscsi-config.guess
 Patch0:        open-iscsi-2.0_873-slp.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
-BuildRequires: ldconfig
 BuildRequires: libkmod-devel
 BuildRequires: libmount-devel
 BuildRequires: libopen-isns-devel
@@ -52,32 +50,45 @@ This package contains libraries and header files for developing applications tha
 #sed -i "s,| arm-\*  |,| aarch64-\* | arm-\*  |," utils/open-isns/aclocal/config.sub
 
 %build
-%make LIB_DIR=%{_libdir}
+%make \
+   LIB_DIR=%{_libdir} \
+   RULESDIR=%{_udevrulesdir} \
+   SBINDIR=%{_sbindir} \
+   user
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
-%makeinstall LIB_DIR=%{_libdir}
+%makeinstall \
+   LIB_DIR=%{_libdir} \
+   RULESDIR=%{_udevrulesdir} \
+   SBINDIR=%{_sbindir} \
+   install_systemd
+
+#install -D -m0755 usr/iscsistart %{buildroot}%{_sbindir}/iscsistart
+#install -D -m0644 doc/iscsistart.8 %{buildroot}%{_mandir}/man8/iscsistart.8
 
-install -D -m0755 usr/iscsistart %{buildroot}/sbin/iscsistart
-install -D -m0644 doc/iscsistart.8 %{buildroot}%{_mandir}/man8/iscsistart.8
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
 %files
 %defattr(-,root,root)
+%{_sysconfdir}/logrotate.d/iscsiuiolog
 %dir %{_sysconfdir}/iscsi
 %dir %{_sysconfdir}/iscsi/ifaces
 %{_sysconfdir}/iscsi/ifaces/iface.example
 %{_sysconfdir}/iscsi/initiatorname.iscsi
 %config(noreplace) %{_sysconfdir}/iscsi/iscsid.conf
-/sbin/iscsi*
-%{_mandir}/man8/iscsi_discovery.8*
-%{_mandir}/man8/iscsiadm.8*
-%{_mandir}/man8/iscsid.8*
-%{_mandir}/man8/iscsistart.8*
-%{_mandir}/man8/iscsi-iname.8*
-%{_mandir}/man8/iscsi_fw_login.8*
-%{_mandir}/man8/iscsiuio.8*
+%{_sbindir}/brcm_iscsiuio
+%{_sbindir}/iscsi*
+%{_unitdir}/iscsi-init.service
+%{_unitdir}/iscsi.service
+%{_unitdir}/iscsid.service
+%{_unitdir}/iscsid.socket
+%{_unitdir}/iscsiuio.service
+%{_unitdir}/iscsiuio.socket
+%{_systemdgeneratordir}/ibft-rule-generator
+%{_udevrulesdir}/50-iscsi-firmware-login.rules
+%{_mandir}/man8/iscsi*.8*
 
 %files -n lib%{name}
 %defattr(-,root,root)
@@ -88,9 +99,14 @@ install -D -m0644 doc/iscsistart.8 %{buildroot}%{_mandir}/man8/iscsistart.8
 %defattr(-,root,root)
 %{_includedir}/libopeniscsiusr*.h
 %{_libdir}/libopeniscsiusr.so
+%{_mandir}/man3/iscsi*.3*
+%{_mandir}/man3/libopeniscsiusr.h.3*
 %{_libdir}/pkgconfig/libopeniscsiusr.pc
 
 %changelog
+* Mon Oct 24 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 2.1.8-1mamba
+- update to 2.1.8
+
 * Sat Mar 13 2021 Automatic Build System <autodist@mambasoft.it> 2.1.4-1mamba
 - automatic version update by autodist