diff --git a/tomcat-9.0-jsvc.service b/tomcat-9.0-jsvc.service
index 5cc309b..34f8a26 100644
--- a/tomcat-9.0-jsvc.service
+++ b/tomcat-9.0-jsvc.service
@@ -14,8 +14,8 @@ After=syslog.target network.target
 Type=simple
 EnvironmentFile=/etc/tomcat/tomcat.conf
 Environment="NAME=" "USE_JSVC=true"
-ExecStart=/usr/libexec/tomcat/server start
-ExecStop=/usr/libexec/tomcat/server stop
+ExecStart=@LIBEXECDIR@/tomcat/server start
+ExecStop=@LIBEXECDIR@/tomcat/server stop
 
 [Install]
 WantedBy=multi-user.target
diff --git a/tomcat-9.0.service b/tomcat-9.0.service
index 7ef3d01..07731a2 100644
--- a/tomcat-9.0.service
+++ b/tomcat-9.0.service
@@ -14,8 +14,8 @@ Type=simple
 EnvironmentFile=/etc/tomcat/tomcat.conf
 Environment="NAME="
 EnvironmentFile=-/etc/sysconfig/tomcat
-ExecStart=/usr/libexec/tomcat/server start
-ExecStop=/usr/libexec/tomcat/server stop
+ExecStart=@LIBEXECDIR@/tomcat/server start
+ExecStop=@LIBEXECDIR@/tomcat/server stop
 SuccessExitStatus=143
 User=tomcat
 Group=tomcat
diff --git a/tomcat-9.0.wrapper b/tomcat-9.0.wrapper
index d8167ad..420d649 100644
--- a/tomcat-9.0.wrapper
+++ b/tomcat-9.0.wrapper
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ "$1" = "version" ]; then
-  . /usr/libexec/tomcat/preamble
+  . @LIBEXECDIR@/tomcat/preamble
   exec ${JAVACMD} -classpath ${CATALINA_HOME}/lib/catalina.jar \
     org.apache.catalina.util.ServerInfo
 fi
diff --git a/tomcat-named.service b/tomcat-named.service
index a7f78c7..2d742a7 100644
--- a/tomcat-named.service
+++ b/tomcat-named.service
@@ -15,8 +15,8 @@ Type=simple
 EnvironmentFile=/etc/tomcat/tomcat.conf
 Environment="NAME=%I"
 EnvironmentFile=-/etc/sysconfig/tomcat@%I
-ExecStart=/usr/libexec/tomcat/server start
-ExecStop=/usr/libexec/tomcat/server stop
+ExecStart=@LIBEXECDIR@/tomcat/server start
+ExecStop=@LIBEXECDIR@/tomcat/server stop
 SuccessExitStatus=143
 User=tomcat
 Group=tomcat
diff --git a/tomcat-preamble b/tomcat-preamble
index 731c83c..23c40dd 100644
--- a/tomcat-preamble
+++ b/tomcat-preamble
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /usr/libexec/tomcat/functions
+. @LIBEXECDIR@/tomcat/functions
 
 # Get the tomcat config (use this for environment specific settings)
 
diff --git a/tomcat-server b/tomcat-server
index 40a6f8f..18eb831 100644
--- a/tomcat-server
+++ b/tomcat-server
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /usr/libexec/tomcat/preamble
+. @LIBEXECDIR@/tomcat/preamble
 
 MAIN_CLASS=org.apache.catalina.startup.Bootstrap
 
diff --git a/tomcat.changes b/tomcat.changes
index 2403692..efd8582 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jul 13 13:41:43 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Do not hardcode /usr/libexec but use %%_libexecdir during the
+  build
+  * Fixes for platforms, where /usr/libexec and %%_libexecdir are
+    different
+
 -------------------------------------------------------------------
 Thu Jul  7 15:35:34 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/tomcat.spec b/tomcat.spec
index 4103223..a38bf65 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -385,12 +385,12 @@ sed -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
    -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
    -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE3} \
     > %{buildroot}%{_fillupdir}/sysconfig.%{name}
-install -m 0644 %{SOURCE4} \
-    %{buildroot}%{_sbindir}/%{name}
-install -m 0644 %{SOURCE11} \
-    %{buildroot}%{_unitdir}/%{name}.service
-install -m 0644 %{SOURCE20} \
-    %{buildroot}%{_unitdir}/%{name}-jsvc.service
+sed -e "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE4} \
+    > %{buildroot}%{_sbindir}/%{name}
+sed -e "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE11} \
+    > %{buildroot}%{_unitdir}/%{name}.service
+sed -e "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE20} \
+    > %{buildroot}%{_unitdir}/%{name}-jsvc.service
 sed -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE5} \
     > %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 sed -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
@@ -402,14 +402,16 @@ sed -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
    -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE7} \
     > %{buildroot}%{_bindir}/%{name}-tool-wrapper
 
-install -m 0644 %{SOURCE21} \
-    %{buildroot}%{_libexecdir}/%{name}/functions
-install -m 0755 %{SOURCE30} \
-    %{buildroot}%{_libexecdir}/%{name}/preamble
-install -m 0755 %{SOURCE31} \
-    %{buildroot}%{_libexecdir}/%{name}/server
-install -m 0644 %{SOURCE32} \
-    %{buildroot}%{_unitdir}/%{name}@.service
+sed -e "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE21} \
+    > %{buildroot}%{_libexecdir}/%{name}/functions
+sed -e "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE30} \
+    > %{buildroot}%{_libexecdir}/%{name}/preamble
+chmod 0755 %{buildroot}%{_libexecdir}/%{name}/preamble
+sed -e "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE31} \
+    > %{buildroot}%{_libexecdir}/%{name}/server
+chmod 0755 %{buildroot}%{_libexecdir}/%{name}/server
+sed -e "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE32} \
+    > %{buildroot}%{_unitdir}/%{name}@.service
 
 ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rc%{name}
 ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rc%{name}-jsvc