diff --git a/gpm.spec b/gpm.spec
index 73079ae..73a350a 100644
--- a/gpm.spec
+++ b/gpm.spec
@@ -18,6 +18,9 @@ Patch6: gpm-1.20.6-libtool.patch
 Requires(post): systemd-units systemd-sysv chkconfig info
 Requires(preun): systemd-units info
 Requires(postun): systemd-units
+BuildRequires: systemd-units
+Conflicts:     systemd < 38
+Conflicts:     filesystem < 3
 # this defines the library version that this package builds.
 %define LIBVER 2.1.0
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
@@ -92,12 +95,12 @@ rm -f %{buildroot}%{_datadir}/emacs/site-lisp/t-mouse.el
 
 %ifnarch s390 s390x
 mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
-mkdir -p %{buildroot}/lib/systemd/system/
+mkdir -p %{buildroot}%{_unitdir}/
 install -m 755 inputattach %{buildroot}%{_sbindir}
 install -m 644 conf/gpm-* %{buildroot}%{_sysconfdir}
 # Systemd
-mkdir -p %{buildroot}/lib/systemd/system
-install -m644 %{SOURCE1} %{buildroot}/lib/systemd/system
+mkdir -p %{buildroot}%{_unitdir}
+install -m644 %{SOURCE1} %{buildroot}%{_unitdir}
 rm -rf %{buildroot}%{_initrddir}
 %else
 # we're shipping only libraries in s390[x], so
@@ -161,7 +164,7 @@ if [ $1 = 0 ]; then
 %{_infodir}/*
 %ifnarch s390 s390x
 %config(noreplace) %{_sysconfdir}/gpm-*
-/lib/systemd/system/gpm.service
+%{_unitdir}/gpm.service
 %{_sbindir}/*
 %{_bindir}/*
 %{_mandir}/man?/*