diff --git a/kernel.spec b/kernel.spec
index d29cb6018..806be8688 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -131,7 +131,7 @@ Summary: The Linux kernel
 %define patchlevel 14
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 100%{?buildid}.0.riscv64%{?dist}
+%define specrelease 100%{?buildid}.1.riscv64%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -466,10 +466,6 @@ Summary: The Linux kernel
 %define kernel_image arch/arm64/boot/Image.gz
 %endif
 
-%ifarch riscv64
-%define with_selftests 0
-%endif
-
 %ifarch riscv64
 %define all_arch_configs kernel-%{version}-riscv64*.config
 %define asmarch riscv
@@ -2102,7 +2098,7 @@ BuildKernel() {
     # the F17 UsrMove feature.
     ln -sf $DevelDir $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
 
-%ifnarch armv7hl riscv64
+%ifnarch armv7hl
     # Generate vmlinux.h and put it to kernel-devel path
     bpftool btf dump file vmlinux format c > $RPM_BUILD_ROOT/$DevelDir/vmlinux.h
 %endif
@@ -2975,8 +2971,8 @@ fi
 #
 #
 %changelog
-* Sat Nov 13 2021 David Abdurachmanov <david.abdurachmanov@gmail.com> [5.14.18-1.0.riscv64]
-- Enable riscv64 arch
+* Sat Nov 13 2021 David Abdurachmanov <david.abdurachmanov@gmail.com> [5.14.18-1.1.riscv64]
+- Enable selftest and bpftool on riscv64
 
 * Fri Nov 12 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.18-1]
 - usb: xhci: tegra: Check padctrl interrupt presence in device tree (Dmitry Osipenko)