diff --git a/s390-tools.changes b/s390-tools.changes
index 8e5202b..276919f 100644
--- a/s390-tools.changes
+++ b/s390-tools.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:41:27 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Tue Nov 14 21:38:25 UTC 2017 - mpost@suse.com
 
diff --git a/s390-tools.spec b/s390-tools.spec
index 2d5102e..60e0d05 100644
--- a/s390-tools.spec
+++ b/s390-tools.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
+
 Name:           s390-tools
 Version:        2.1.0
 Release:        0
@@ -223,10 +228,10 @@ install -D -m644 etc/udev/rules.d/40-z90crypt.rules %{buildroot}/usr/lib/udev/ru
 install -D -m644 etc/udev/rules.d/57-osasnmpd.rules %{buildroot}/usr/lib/udev/rules.d/57-osasnmpd.rules
 install -D -m644 etc/udev/rules.d/59-dasd.rules %{buildroot}/usr/lib/udev/rules.d/59-dasd.rules
 install -D -m644 etc/udev/rules.d/90-cpi.rules %{buildroot}/usr/lib/udev/rules.d/90-cpi.rules
-install -D -m644 etc/sysconfig/cpi %{buildroot}/var/adm/fillup-templates/sysconfig.cpi
-install -D -m644 etc/sysconfig/dumpconf %{buildroot}/var/adm/fillup-templates/sysconfig.dumpconf
-install -D -m644 etc/sysconfig/mon_fsstatd %{buildroot}/var/adm/fillup-templates/sysconfig.mon_fsstatd
-install -D -m644 etc/sysconfig/mon_procd %{buildroot}/var/adm/fillup-templates/sysconfig.mon_procd
+install -D -m644 etc/sysconfig/cpi %{buildroot}%{_fillupdir}/sysconfig.cpi
+install -D -m644 etc/sysconfig/dumpconf %{buildroot}%{_fillupdir}/sysconfig.dumpconf
+install -D -m644 etc/sysconfig/mon_fsstatd %{buildroot}%{_fillupdir}/sysconfig.mon_fsstatd
+install -D -m644 etc/sysconfig/mon_procd %{buildroot}%{_fillupdir}/sysconfig.mon_procd
 mv iucvterm/doc/ts-shell/iucvconn_on_login %{buildroot}/usr/bin/iucvconn_on_login
 install -D -m644 %{S:26} %{buildroot}/%{_unitdir}/cio_ignore.service
 install -D -m755 %{S:27} %{buildroot}/usr/lib/systemd/scripts/setup_cio_ignore.sh
@@ -240,16 +245,16 @@ cp  %{S:23} README.SUSE
 
 cd %{buildroot}
 install -D -m755 %{S:3} etc/init.d/hsnc
-install -D -m644 %{S:4} var/adm/fillup-templates/sysconfig.hsnc
+install -D -m644 %{S:4} %{buildroot}%{_fillupdir}/sysconfig.hsnc
 install -D -m755 %{S:5} etc/init.d/xpram
-install -D -m644 %{S:6} var/adm/fillup-templates/sysconfig.xpram
+install -D -m644 %{S:6} %{buildroot}%{_fillupdir}/sysconfig.xpram
 install -D -m755 %{S:7} etc/init.d/appldata
-install -D -m644 %{S:8} var/adm/fillup-templates/sysconfig.appldata
+install -D -m644 %{S:8} %{buildroot}%{_fillupdir}/sysconfig.appldata
 install -D -m755 %{S:9} etc/init.d/vmlogrdr
 install -D -m755 %{S:10} sbin/dasdro
 install -D -m755 %{S:11} sbin/dasd_reload
 install -D -m755 %{S:12} sbin/mkdump
-install -D -m644 %{S:13} var/adm/fillup-templates/sysconfig.osasnmpd
+install -D -m644 %{S:13} %{buildroot}%{_fillupdir}/sysconfig.osasnmpd
 install -D -m755 %{S:14} sbin/zfcp_san_disc
 install -D -m644 %{S:15} %{buildroot}/%{_mandir}/man8
 install -D -m644 %{S:19} %{buildroot}/usr/lib/udev/rules.d/52-xpram.rules
@@ -260,7 +265,7 @@ install -D -m644 %{S:29} %{buildroot}/usr/lib/udev/rules.d/59-zfcp-compat.rules
 install -D -m644 %{S:30} %{buildroot}/etc/modprobe.d/90-s390-tools.conf
 install -D -m755 %{S:32} %{buildroot}/sbin/killcdl
 install -D -m755 %{S:33} %{buildroot}/sbin/lgr_check
-install -D -m644 %{S:34} var/adm/fillup-templates/sysconfig.virtsetup
+install -D -m644 %{S:34} %{buildroot}%{_fillupdir}/sysconfig.virtsetup
 
 if [ ! -d %{_sbindir} ]; then
     rm -f %{_sbindir}
@@ -299,7 +304,7 @@ rm -fv %{buildroot}/%{_sbindir}/lsmem
 rm -fv %{buildroot}/%{_sbindir}/chmem
 
 find . ! -type d |
-    %__sed 's/^.//;\-/man/-s/^.*$/%doc &.gz/' > %{_builddir}/%{name}-filelist 
+    %__sed 's/^.//;\-/man/-s/^.*$/%doc &.gz/' > %{_builddir}/%{name}-filelist
 grep -v -E 'osasnmp|*\.conf$' %{_builddir}/%{name}-filelist >%{_builddir}/%{name}.list
 grep    osasnmp[^-] %{_builddir}/%{name}-filelist >%{_builddir}/%{name}.osasnmp