diff --git a/keyutils.changes b/keyutils.changes
index 2eb3abf..2f9d542 100644
--- a/keyutils.changes
+++ b/keyutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 24 12:54:11 UTC 2021 - Alberto Planas Dominguez <aplanas@suse.com>
+
+- Add /etc/keys/ and /usr/etc/keys/ directory (bsc#1187654)
+
 -------------------------------------------------------------------
 Wed Jan  6 10:27:14 UTC 2021 - Marcus Meissner <meissner@suse.com>
 
diff --git a/keyutils.spec b/keyutils.spec
index 0e59541..d9c912e 100644
--- a/keyutils.spec
+++ b/keyutils.spec
@@ -16,6 +16,12 @@
 #
 
 
+%if ! %{defined _distconfdir}
+%define _distconfdir %{_sysconfdir}
+%else
+%define use_usretc 1
+%endif
+
 %define lname	libkeyutils1
 Name:           keyutils
 Version:        1.6.3
@@ -80,6 +86,12 @@ ln -s /%{_sbindir}/key.dns_resolver %{buildroot}/sbin
 ln -s /%{_sbindir}/request-key %{buildroot}/sbin
 %endif
 
+install -m 0750 -d \
+	%{buildroot}%{_sysconfdir}/keys \
+	%{buildroot}%{_sysconfdir}/keys/ima \
+	%{buildroot}%{_distconfdir}/keys \
+	%{buildroot}%{_distconfdir}/keys/ima
+
 %post -n %{lname} -p /sbin/ldconfig
 %postun -n %{lname} -p /sbin/ldconfig
 
@@ -96,6 +108,12 @@ ln -s /%{_sbindir}/request-key %{buildroot}/sbin
 %{_mandir}/*/*
 %config(noreplace) %{_sysconfdir}/request-key.conf
 %dir %{_sysconfdir}/request-key.d/
+%dir %{_sysconfdir}/keys/
+%dir %{_sysconfdir}/keys/ima/
+%if %{defined use_usretc}
+%dir %{_distconfdir}/keys/
+%dir %{_distconfdir}/keys/ima/
+%endif
 
 %files -n %{lname}
 %license LICENCE.LGPL