diff --git a/corosync.changes b/corosync.changes
index 08cd65d..47df0ab 100644
--- a/corosync.changes
+++ b/corosync.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:48:33 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Fri Nov 17 02:54:23 UTC 2017 - bliu@suse.com
 
diff --git a/corosync.spec b/corosync.spec
index e0a8178..af0431e 100644
--- a/corosync.spec
+++ b/corosync.spec
@@ -16,6 +16,11 @@
 #
 
 
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir /var/adm/fillup-templates
+%endif
+
 # Conditionals
 # Invoke "rpmbuild --without <feature>" or "rpmbuild --with <feature>"
 # to disable or enable specific features
@@ -220,7 +225,7 @@ rm -rf %{buildroot}%{_docdir}/*
 rm -rf init/corosync init/corosync-qnetd init/corosync-qdevice
 mkdir -p  %{buildroot}/usr/lib/tmpfiles.d/
 mkdir -p  %{buildroot}/usr/share/doc/packages/corosync/
-mkdir -p  %{buildroot}/var/adm/fillup-templates/
+mkdir -p  %{buildroot}%{_fillupdir}/
 mkdir -p  %{buildroot}%{_sysconfdir}/init.d/
 install -m 0644 tools/corosync-notifyd.sysconfig.example  %{buildroot}/usr/lib/tmpfiles.d/corosync-notifyd
 install -m 0644 conf/corosync.conf.example* %{buildroot}/usr/share/doc/packages/corosync/
@@ -228,17 +233,17 @@ rm -rf %{buildroot}/etc/corosync/corosync.conf.example*
 rm -rf %{buildroot}/etc/logrotate.d/
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
 install -m 644 init/corosync.sysconfig.example \
-   %{buildroot}/var/adm/fillup-templates/sysconfig.corosync
+   %{buildroot}%{_fillupdir}/sysconfig.corosync
 rm -rf %{buildroot}%{localstatedir}/run/
 %if %{with qdevices}
 install -m 644 init/corosync-qdevice.sysconfig.example \
-   %{buildroot}/var/adm/fillup-templates/sysconfig.corosync-qdevice
+   %{buildroot}%{_fillupdir}/sysconfig.corosync-qdevice
 install -m 770 -d %{buildroot}/run/corosync-qdevice
 %endif
 
 %if %{with qnetd}
 install -m 644 init/corosync-qnetd.sysconfig.example \
-   %{buildroot}/var/adm/fillup-templates/sysconfig.corosync-qnetd
+   %{buildroot}%{_fillupdir}/sysconfig.corosync-qnetd
 install -m 770 -d %{buildroot}/run/corosync-qnetd
 %if %{with systemd}
 sed -i -e 's/^#User=/User=/' \
@@ -304,7 +309,7 @@ fi
 %config(noreplace) /usr/share/doc/packages/corosync/corosync.conf.example
 %config(noreplace) /usr/share/doc/packages/corosync/corosync.conf.example.udpu
 %config(noreplace) /usr/lib/tmpfiles.d/corosync-notifyd
-%config(noreplace) /var/adm/fillup-templates/sysconfig.corosync
+%config(noreplace) %{_fillupdir}/sysconfig.corosync
 
 %if %{with dbus}
 %{_sysconfdir}/dbus-1/system.d/corosync-signals.conf
@@ -600,7 +605,7 @@ fi
 %{_sbindir}/corosync-qdevice
 %{_sbindir}/corosync-qdevice-net-certutil
 %{_sbindir}/corosync-qdevice-tool
-%config(noreplace) /var/adm/fillup-templates/sysconfig.corosync-qdevice
+%config(noreplace) %{_fillupdir}/sysconfig.corosync-qdevice
 %if %{with systemd}
 %{_unitdir}/corosync-qdevice.service
 %{_sbindir}/rccorosync-qdevice
@@ -668,7 +673,7 @@ fi
 %{_bindir}/corosync-qnetd
 %{_bindir}/corosync-qnetd-certutil
 %{_bindir}/corosync-qnetd-tool
-%config(noreplace) /var/adm/fillup-templates/sysconfig.corosync-qnetd
+%config(noreplace) %{_fillupdir}/sysconfig.corosync-qnetd
 %if %{with systemd}
 %{_unitdir}/corosync-qnetd.service
 %{_sbindir}/rccorosync-qnetd