diff --git a/rpm.changes b/rpm.changes
index 9187eb1..cfe8f10 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:41:13 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Tue Nov  7 14:27:32 UTC 2017 - rbrown@suse.com
 
diff --git a/rpm.spec b/rpm.spec
index 91405ea..fdc699f 100644
--- a/rpm.spec
+++ b/rpm.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:           rpm
 BuildRequires:  binutils
 BuildRequires:  bzip2
@@ -340,8 +345,8 @@ rm -rf doc/manual/Makefile*
 rm -f %{buildroot}/usr/lib/rpmpopt
 rm -rf %{buildroot}%{_mandir}/{fr,ja,ko,pl,ru,sk}
 rm -f %{buildroot}%{_prefix}/share/locale/de/LC_MESSAGES/rpm.mo
-mkdir -p %{buildroot}/var/adm/fillup-templates
-install -c -m0644 %{SOURCE9} %{buildroot}/var/adm/fillup-templates/
+mkdir -p %{buildroot}%{_fillupdir}
+install -c -m0644 %{SOURCE9} %{buildroot}%{_fillupdir}/
 rm -f %{buildroot}/usr/lib/rpm/cpanflute %{buildroot}/usr/lib/rpm/cpanflute2
 install -m 755 %{SOURCE5} %{buildroot}/usr/lib/rpm
 install -m 755 scripts/find-supplements{,.ksyms} %{buildroot}/usr/lib/rpm
@@ -447,7 +452,7 @@ fi
 %dir	%attr(755,root,root) /usr/src/packages/RPMS
 %dir	%attr(755,root,root) /usr/src/packages/BUILDROOT
 %dir	%attr(755,root,root) /usr/src/packages/RPMS/*
-	/var/adm/fillup-templates/sysconfig.services-rpm
+	%{_fillupdir}/sysconfig.services-rpm
 
 %files build
 %defattr(-,root,root)