diff --git a/tomcat.changes b/tomcat.changes
index a1f2600..2eb82d4 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:50:29 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Mon Oct 23 09:42:48 UTC 2017 - malbu@suse.com
 
diff --git a/tomcat.spec b/tomcat.spec
index 5435a49..c214b54 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -17,6 +17,11 @@
 #
 
 
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir /var/adm/fillup-templates
+%endif
+
 %define jspspec 2.3
 %define servletspec 3.1
 %define elspec 3.0
@@ -354,7 +359,7 @@ install -d -m 0775 %{buildroot}%{tempdir}
 install -d -m 0775 %{buildroot}%{workdir}
 install -d -m 0755 %{buildroot}%{_unitdir}
 install -d -m 0755 %{buildroot}%{_libexecdir}/%{name}
-install -d -m 0755 %{buildroot}%{_localstatedir}/adm/fillup-templates
+install -d -m 0755 %{buildroot}%{_fillupdir}
 
 # move things into place
 # First copy supporting libs to tomcat lib
@@ -385,7 +390,7 @@ sed -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
 sed -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
    -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
    -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE3} \
-    > %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
+    > %{buildroot}%{_fillupdir}/sysconfig.%{name}
 install -m 0644 %{SOURCE4} \
     %{buildroot}%{_sbindir}/%{name}
 install -m 0644 %{SOURCE11} \
@@ -686,7 +691,7 @@ rm -f \
 %{homedir}/work
 %{homedir}/logs
 %{homedir}/conf
-%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
+%{_fillupdir}/sysconfig.%{name}
 
 %files admin-webapps
 %{appdir}/host-manager