diff --git a/tomcat.changes b/tomcat.changes
index 5ed8399..24da83d 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Apr  7 13:01:07 UTC 2016 - tchvatal@suse.com
+
+- Fix fixme for the prereq preamble value
+- It seems systemd prints error on adding the @ services to macros
+  so do not do that
+
 -------------------------------------------------------------------
 Thu Mar 31 08:18:39 UTC 2016 - dmacvicar@suse.de
 
diff --git a/tomcat.spec b/tomcat.spec
index 282d84d..615cfd9 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -110,9 +110,7 @@ Requires:       jakarta-commons-dbcp
 Requires:       jakarta-commons-logging
 Requires:       jakarta-commons-pool
 Requires:       log4j
-# FIXME: use proper Requires(pre/post/preun/...)
-PreReq:         %fillup_prereq
-Requires(post): systemd-rpm-macros
+Requires(post): %fillup_prereq
 Requires(pre):  %{_sbindir}/groupadd
 Requires(pre):  %{_sbindir}/useradd
 Recommends:     libtcnative-1-0 >= 1.1.24
@@ -599,22 +597,18 @@ EOF
 %{_sbindir}/groupadd -r tomcat 2>/dev/null || :
 %{_sbindir}/useradd -c "Apache Tomcat" -g tomcat \
     -s /bin/sh -r -d %{homedir} tomcat 2>/dev/null || :
-%service_add_pre %{name}.service
-%service_add_pre %{name}@.service
+%service_add_pre %{name}.service 
 
 %post
 %service_add_post %{name}.service
-%service_add_post %{name}@.service
-%fillup_only
+%{fillup_only %{name}}
 %{_bindir}/systemd-tmpfiles --create  >/dev/null 2>&1 || :
 
 %preun
 %service_del_preun %{name}.service
-%service_del_preun %{name}@.service
 
 %postun
 %service_del_postun %{name}.service
-%service_del_postun %{name}@.service
 
 %pre jsvc
 %service_add_pre %{name}-jsvc.service