diff --git a/frr.spec b/frr.spec
index a4bc5d8..8e92e93 100644
--- a/frr.spec
+++ b/frr.spec
@@ -9,7 +9,7 @@
 
 Name:           frr
 Version:        9.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Routing daemon
 License:        GPL-2.0-or-later AND ISC AND LGPL-2.0-or-later AND BSD-2-Clause AND BSD-3-Clause AND (GPL-2.0-or-later  OR ISC) AND MIT
 URL:            http://www.frrouting.org
@@ -132,6 +132,7 @@ autoreconf -ivf
     --disable-ldpd \
     --disable-babeld \
     --with-moduledir=%{_libdir}/frr/modules \
+    --with-yangmodelsdir=%{_datadir}/frr-yang/ \
     --with-crypto=openssl \
     --enable-fpm \
     %{?with_grpc:--enable-grpc}
@@ -262,8 +263,8 @@ rm tests/lib/*grpc*
 %config(noreplace) %attr(644,frr,frr) %{_sysconfdir}/frr/daemons
 %config(noreplace) %{_sysconfdir}/pam.d/frr
 %{_unitdir}/*.service
-%dir %{_datadir}/yang
-%{_datadir}/yang/*.yang
+%dir %{_datadir}/frr-yang/
+%{_datadir}/frr-yang/*.yang
 %{_tmpfilesdir}/%{name}.conf
 %{_sysusersdir}/%{name}.conf
 
@@ -275,6 +276,10 @@ rm tests/lib/*grpc*
 %endif
 
 %changelog
+* Tue Apr 16 2024 Michal Ruprich <mruprich@redhat.com> - 9.1-4
+- Moving yang modules to an frr specific directory to avoid conflicts
+- Adding rpminspect.yaml
+
 * Thu Apr 11 2024 Michal Ruprich <mruprich@redhat.com> - 9.1-3
 - Resolves: RHEL-32502 - frr fails to start: SELinux is preventing watchfrr from create access on the sock_file
 
diff --git a/rpminspect.yaml b/rpminspect.yaml
new file mode 100644
index 0000000..c873be7
--- /dev/null
+++ b/rpminspect.yaml
@@ -0,0 +1,7 @@
+---
+runpath:
+    allowed_paths:
+        - /usr/lib64/frr
+        - /usr/lib/frr
+inspections:
+    badfuncs: off