diff --git a/grub2.changes b/grub2.changes
index ee77b17..ae20dcd 100644
--- a/grub2.changes
+++ b/grub2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri May 20 09:28:16 UTC 2016 - jengelh@inai.de
+
+- Make sure all systemd unit files are passed to %service_ macros.
+
 -------------------------------------------------------------------
 Thu May 19 14:56:53 UTC 2016 - agraf@suse.com
 
diff --git a/grub2.spec b/grub2.spec
index 42e9824..0d17324 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -700,7 +700,11 @@ perl -ni -e '
 %fdupes %buildroot%{_bindir}
 %fdupes %buildroot%{_libdir}
 
+%pre
+%service_add_pre grub2-once.service
+
 %post
+%service_add_post grub2-once.service
 /sbin/install-info %{_infodir}/grub-dev.info %{_infodir}/dir || :
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
 
@@ -785,6 +789,7 @@ exit 0
 %endif
 
 %preun
+%service_del_preun grub2-once.service
 if [ $1 = 0 ]; then
   /sbin/install-info --delete %{_infodir}/grub-dev.info %{_infodir}/dir || :
   /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
@@ -825,6 +830,9 @@ fi
 %define source_dir build
 %endif
 
+%postun
+%service_del_postun grub2-once.service
+
 %files -f %{source_dir}/%{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING NEWS README