diff --git a/issue-generator.changes b/issue-generator.changes
index 48b0c92..fc40740 100644
--- a/issue-generator.changes
+++ b/issue-generator.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Tue Nov 28 13:10:37 CET 2017 - kukuk@suse.de
+
+- Use official systemd macros in %post install
+
+-------------------------------------------------------------------
+Tue Nov 28 11:51:23 CET 2017 - kukuk@suse.de
+
+- Don't require systemd: if it's there, we will use it, if it is
+  not there like in a base container image, there is nothing to do
+  for us.
+
+-------------------------------------------------------------------
+Thu Nov 23 13:42:31 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Wed May 31 15:18:23 CEST 2017 - kukuk@suse.de
 
diff --git a/issue-generator.spec b/issue-generator.spec
index 6b92195..7af9d38 100644
--- a/issue-generator.spec
+++ b/issue-generator.spec
@@ -28,7 +28,6 @@ BuildRequires:  fdupes
 Requires(post): %fillup_prereq
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
-%{?systemd_requires}
 
 %description
 issue-generator is a tool to create an issue file dynamically.
@@ -44,15 +43,15 @@ make %{?_smp_mflags}
 make %{?_smp_mflags} DESTDIR=%{buildroot} install
 ln -sf service %{buildroot}%{_sbindir}/rcissue-generator
 ln -sf service %{buildroot}%{_sbindir}/rcissue-add-ssh-keys
-mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
-install -m 644 udev/sysconfig.issue-generator %{buildroot}%{_localstatedir}/adm/fillup-templates/
+mkdir -p %{buildroot}%{_fillupdir}
+install -m 644 udev/sysconfig.issue-generator %{buildroot}%{_fillupdir}/
 %fdupes %{buildroot}%{_mandir}
 
 %pre
 %service_add_pre issue-generator.service issue-add-ssh-keys.service
 
 %post
-%{_bindir}/systemd-tmpfiles --create issue-generator.conf ||:
+%tmpfiles_create issue-generator.conf
 %{fillup_only -n issue-generator}
 %service_add_post issue-generator.service issue-add-ssh-keys.service
 
@@ -71,7 +70,7 @@ install -m 644 udev/sysconfig.issue-generator %{buildroot}%{_localstatedir}/adm/
 %dir %{_prefix}/lib/tmpfiles.d
 %dir %{_prefix}/lib/udev
 %dir %{_prefix}/lib/udev/rules.d
-%{_localstatedir}/adm/fillup-templates/sysconfig.issue-generator
+%{_fillupdir}/sysconfig.issue-generator
 %{_prefix}/lib/tmpfiles.d/issue-generator.conf
 %{_prefix}/lib/udev/rules.d/90-issue-generator.rules
 %{_prefix}/lib/systemd/system/issue-add-ssh-keys.service