diff --git a/lustre.spec b/lustre.spec
index 14db31a6cc93f8bae8aecac9681207efbf4b4e6a..86ac76f1492a7a565a8800ae0a72f33429cfa1ee 100644
--- a/lustre.spec
+++ b/lustre.spec
@@ -51,7 +51,7 @@
 
 %{!?version: %global version 2.15.54}
 # if you want a custom kernel version set it variable with $ver.$arch
-%{!?kver:    %global kver    %(rpm -q --qf '%%{VERSION}-%%{RELEASE}.%%{ARCH}' `rpm -q kernel-devel | sort -r|head -n 1`)}
+%{!?kver:    %global kver    %(rpm -q --qf '%%{VERSION}-%%{RELEASE}.%%{ARCH}' `rpm -q kernel-devel | sort -rV|head -n 1`)}
 # cut epoch for kmodtool
 %define _kver %(echo %{kver} | sed -e 's/^[0-9]*://')
 # trust version from kdir - but it can lost 'epoch'
@@ -179,7 +179,7 @@
 Summary: Lustre File System
 Name: %{lustre_name}
 Version: 2.15.54
-Release: 1%{?dist}
+Release: 2
 License: GPL-2.0-only AND LGPL-2.1-or-later
 Group: System Environment/Kernel
 Source: https://github.com/lustre/lustre-release/archive/refs/tags/%{version}.tar.gz
@@ -876,5 +876,9 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf %{_tmppath}/kmp
 
 %changelog
+* Thu Apr 20 2023 Xinliang Liu <xinliang.liu@linaro.org> - 2.15.54-2
+- Fix release number contains double %{dist}, e.g. *.oe1.oe1.aarch64.rpm
+- Fix sort by version number when finding the latest kernel version.
+
 * Tue Mar 28 2023 Xinliang Liu <xinliang.liu@linaro.org> - 2.15.54-1
 - Initial RPM release, client support, with kernel 6.1 client patches