diff --git a/systemd-rpm-macros.changes b/systemd-rpm-macros.changes
index 6005279..f683614 100644
--- a/systemd-rpm-macros.changes
+++ b/systemd-rpm-macros.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Nov  9 07:35:12 UTC 2020 - Franck Bui <fbui@suse.com>
+
+- Make rpmbuild load our own macros.systemd to import %{%_unitdir} properly
+
+  Ideally we should also own other %{_*dir} paths...
+
+- Stop owning /usr/lib/systemd directory as no package other than
+  systemd is supposed to put files there.
+
 -------------------------------------------------------------------
 Mon Nov  2 14:36:43 UTC 2020 - Franck Bui <fbui@suse.com>
 
@@ -7,6 +17,11 @@ Mon Nov  2 14:36:43 UTC 2020 - Franck Bui <fbui@suse.com>
   used by packages that need to prevent theirs services from being
   restarted.
 
+-------------------------------------------------------------------
+Fri Oct 30 17:39:01 UTC 2020 - Franck Bui <fbui@suse.com>
+
+- Bump version to 5
+
 -------------------------------------------------------------------
 Fri Oct 30 17:37:54 UTC 2020 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd-rpm-macros.spec b/systemd-rpm-macros.spec
index 726e0ac..2d6bc82 100644
--- a/systemd-rpm-macros.spec
+++ b/systemd-rpm-macros.spec
@@ -30,6 +30,9 @@ BuildArch:      noarch
 #!BuildIgnore:  util-linux
 #!BuildIgnore:  %{name}
 
+# We need our own definition of %{_unitdir}.
+%{?load:%{S0}}
+
 %description
 Starting with openSUSE 12.1, several RPM macros must be used to package systemd
 services files. This package provides these macros.
@@ -40,14 +43,11 @@ services files. This package provides these macros.
 
 %install
 install -Dm644 %{S:0} %{buildroot}%{_rpmconfigdir}/macros.d/macros.systemd
-UNITDIR="$(sed -n 's/.*_unitdir[[:blank:]]*//p' %{S:0})"
-for i in $UNITDIR `dirname $UNITDIR`; do
-   mkdir -p %{buildroot}$i
-   echo $i >> unitdir
-done
+mkdir -p %{buildroot}%{_unitdir}
 
-%files -f unitdir
+%files
 %defattr(-,root,root)
 %{_rpmconfigdir}/macros.d/macros.systemd
+%dir %{_unitdir}
 
 %changelog