diff --git a/.gitignore b/.gitignore
index 5f90620..8490aae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/lldpd-1.0.4-free.tar.gz
+SOURCES/lldpd-1.0.18-free.tar.gz
diff --git a/.lldpd.metadata b/.lldpd.metadata
index a9831e3..a4f0e84 100644
--- a/.lldpd.metadata
+++ b/.lldpd.metadata
@@ -1 +1 @@
-21d990d6530789db5de7b0fcaff9cb8a3ba1b4d5 SOURCES/lldpd-1.0.4-free.tar.gz
+3552b6c8bea1077345bb29e75feb4646c847efad SOURCES/lldpd-1.0.18-free.tar.gz
diff --git a/SPECS/lldpd.spec b/SPECS/lldpd.spec
index 35a88f9..5b59468 100644
--- a/SPECS/lldpd.spec
+++ b/SPECS/lldpd.spec
@@ -9,8 +9,8 @@
 %global gh_owner vincentbernat
 
 Name:     lldpd
-Version:  1.0.4
-Release:  10%{?dist}
+Version:  1.0.18
+Release:  1%{?dist}
 Summary:  ISC-licensed implementation of LLDP
 
 License:  ISC
@@ -156,8 +156,7 @@ fi
 %{_mandir}/man8/lldpcli.8*
 %{_mandir}/man8/lldpctl.8*
 %{_mandir}/man8/%{name}.8*
-%{_libdir}/liblldpctl.so.4
-%{_libdir}/liblldpctl.so.4.8.0
+%{_libdir}/liblldpctl.so.4*
 %dir %{rundir}%{name}
 %dir %{rundir}%{name}/chroot
 %if 0%{?with_systemd}
@@ -176,6 +175,12 @@ fi
 
 
 %changelog
+* Wed Jan 31 2024 Hangbin Liu <haliu@redhat.com> - 1.0.18-1
+- Rebased to 1.0.18 [RHEL-2211]
+
+* Mon Nov 06 2023 Hangbin Liu <haliu@redhat.com> - 1.0.17-1
+- Rebased to 1.0.17 [RHEL-2211, RHEL-5791, RHEL-5796]
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.4-10
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688