diff --git a/macros.systemd b/macros.systemd
index 2b2ad23..665ba91 100644
--- a/macros.systemd
+++ b/macros.systemd
@@ -20,16 +20,10 @@
 # %service_del_postun demo.service
 #
 
-# This is for systemctl
-%systemd_requires									\
-Requires(pre): systemd									\
-Requires(post): systemd									\
-Requires(preun): systemd								\
-Requires(postun): systemd								\
-
 %_unitdir /usr/lib/systemd/system
 %_userunitdir /usr/lib/systemd/user
 %_presetdir /usr/lib/systemd/system-preset
+%_userpresetdir /usr/lib/systemd/user-preset
 %_udevhwdbdir /usr/lib/udev/hwdb.d
 %_udevrulesdir /usr/lib/udev/rules.d
 %_journalcatalogdir /usr/lib/systemd/catalog
@@ -38,6 +32,23 @@ Requires(postun): systemd								\
 %_sysctldir /usr/lib/sysctl.d
 %_ntpunitsdir /usr/lib/systemd/ntp-units.d
 %_binfmtdir /usr/lib/binfmt.d
+%_systemdgeneratordir /usr/lib/systemd/system-generators
+%_systemdusergeneratordir /usr/lib/systemd/user-generators
+%_systemd_system_env_generator_dir /usr/lib/systemd/system-environment-generators
+%_systemd_user_env_generator_dir /usr/lib/systemd/user-environment-generators
+
+%systemd_requires \
+Requires(pre): systemd \
+Requires(post): systemd \
+Requires(preun): systemd \
+Requires(postun): systemd \
+%{nil}
+
+%systemd_ordering \
+OrderWithRequires(post): systemd \
+OrderWithRequires(preun): systemd \
+OrderWithRequires(postun): systemd \
+%{nil}
 
 %_restart_on_update_force() (\
 			test "$YAST_IS_RUNNING" = instsys && exit 0 \
diff --git a/systemd-rpm-macros.changes b/systemd-rpm-macros.changes
index c1be3a8..d9c958d 100644
--- a/systemd-rpm-macros.changes
+++ b/systemd-rpm-macros.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Feb 12 16:56:37 UTC 2018 - fbui@suse.com
+
+- Import more definitions from upstream (v237)
+
 -------------------------------------------------------------------
 Mon Jan 22 11:33:28 UTC 2018 - dimstar@opensuse.org