diff --git a/.gitignore b/.gitignore
index 86275f8..26a1955 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /x86_64/
 /i?86/
 /tarballs/
+/fix-airinv-old-zmq.patch
diff --git a/airinv.spec b/airinv.spec
index 3bb1854..e1d096d 100644
--- a/airinv.spec
+++ b/airinv.spec
@@ -1,33 +1,25 @@
 #
-%global mydocs __tmp_docdir
-#
 Name:           airinv
-Version:        1.00.3
-Release:        1%{?dist}
+Version:        1.00.8
+Release:        %autorelease
 
 Summary:        C++ Simulated Airline Inventory Management System library
-License:        LGPLv2+
-URL:            http://github.com/airsim/%{name}
-Source0:        %{url}/archive/%{name}-%{version}.tar.gz
+License:        LGPL-2.1-or-later
+URL:            https://github.com/airsim/%{name}
+Source0:        %{url}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
 BuildRequires:  gcc-c++
 BuildRequires:  cmake
-BuildRequires:  python3-devel
 BuildRequires:  boost-devel
-BuildRequires:  boost-python3-devel
-BuildRequires:  readline-devel
-BuildRequires:  zeromq-devel
-BuildRequires:  cppzmq-devel
-BuildRequires:  sevmgr-devel
+BuildRequires:  pkgconfig(readline)
+BuildRequires:  pkgconfig(libzmq)
+BuildRequires:  pkgconfig(cppzmq)
 BuildRequires:  soci-mysql-devel
 BuildRequires:  soci-sqlite3-devel
-BuildRequires:  stdair-devel
-BuildRequires:  airrac-devel
-BuildRequires:  rmol-devel
-BuildRequires:  python3-rmol
-BuildRequires:  sevmgr-devel
-BuildRequires:  /usr/bin/epstopdf
-
+BuildRequires:  pkgconfig(stdair)
+BuildRequires:  pkgconfig(airrac)
+BuildRequires:  pkgconfig(rmol)
+BuildRequires:  pkgconfig(sevmgr)
 
 %description
 %{name} is a C++ library of airline inventory management classes and
@@ -35,7 +27,7 @@ functions, mainly targeting simulation purposes.
 
 %{name} makes an extensive use of existing open-source libraries for
 increased functionality, speed and accuracy. In particular the
-Boost (C++ Standard Extensions: http://www.boost.org) library is used.
+Boost (C++ Standard Extensions: https://www.boost.org) library is used.
 
 Install the %{name} package if you need a library of basic C++ objects
 for Airline Inventory Management, mainly for simulation purpose.
@@ -45,9 +37,6 @@ Summary:        Header files, libraries and development helper tools for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig
 
-# The cmake files have Python version backed in them
-Requires:       (python(abi) = %{python3_version} if python3-devel)
-
 %description    devel
 This package contains the header files, shared libraries and
 development helper tools for %{name}. If you would like to develop
@@ -57,41 +46,41 @@ programs using %{name}, you will need to install %{name}-devel.
 Summary:        HTML documentation for the %{name} library
 BuildArch:      noarch
 BuildRequires:  tex(latex)
+BuildRequires:  texlive-epstopdf
 BuildRequires:  doxygen
 BuildRequires:  ghostscript
 
 %description    doc
 This package contains HTML pages, as well as a PDF reference manual,
 for %{name}. All that documentation is generated thanks to Doxygen
-(http://doxygen.org). The content is the same as what can be browsed
-online (http://%{name}.org).
+(https://doxygen.org). The content is the same as what can be browsed
+online (https://github.com/airsim/%{name}).
 
 
 %prep
-%autosetup -n %{name}-%{name}-%{version} 
-
+%autosetup
 
 %build
-%cmake .
-%make_build
+%cmake
+%cmake_build
 
 %install
-%make_install
+%cmake_install
 
-mkdir -p %{mydocs}
-mv $RPM_BUILD_ROOT%{_docdir}/%{name}/html %{mydocs}
-rm -f %{mydocs}/html/installdox
+# Remove the Doxygen installer
+rm -f %{buildroot}%{_docdir}/%{name}/html/installdox
 
 # Remove additional documentation files (those files are already available
 # in the project top directory)
-rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/{NEWS,README,AUTHORS}
+rm -f %{buildroot}%{_docdir}/%{name}/{NEWS,README,AUTHORS}
 
 %check
-ctest
+%ctest
 
 
 %files
-%doc AUTHORS ChangeLog COPYING NEWS README.md
+%doc AUTHORS ChangeLog NEWS README.md
+%license COPYING
 %{_bindir}/%{name}
 %{_bindir}/%{name}_parseInventory
 %{_bindir}/AirInvClient
@@ -103,7 +92,7 @@ ctest
 %{_mandir}/man1/AirInvServer.1.*
 
 %files devel
-%{_includedir}/%{name}
+%{_includedir}/%{name}/
 %{_bindir}/%{name}-config
 %{_libdir}/lib%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
@@ -114,11 +103,10 @@ ctest
 %{_mandir}/man3/%{name}-library.3.*
 
 %files doc
-%doc %{mydocs}/html
-%doc COPYING
+%doc %{_docdir}/%{name}/
+%license COPYING
 
 
 %changelog
-* Mon Oct 28 2019 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.3-1
-- First build on EPEL 8
+%autochangelog
 
diff --git a/sources b/sources
index 241164e..5a2efee 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (airinv-1.00.3.tar.gz) = 34c3632d895c2fefdcfe5b3c6077090ef74df9279929707db413d8d9ae2a2610fa19fdb8a50b491b72fd6f90b9a0ec375e80cd22a4733b53fdc2a9db662473a8
+SHA512 (airinv-1.00.8.tar.gz) = 0f943ce165edbe699f4092d6362b2bb125d19b8a1e3ac8d09e4db24abd361c25249637c986abae0d82f931ff90120495afc05066917b00d78da1b19e560d2655
+SHA512 (fix-airinv-old-zmq.patch) = 75c42db331790b8131876485441526dd9759d0786848c30a95ed22d79d380b9643af4ed5a5905d4633588e4aa3245841a8bc5b693a1bf634b6110332f8ec7959