diff --git a/tomcat-named.service b/tomcat-named.service
index 9bbcb17..7393672 100644
--- a/tomcat-named.service
+++ b/tomcat-named.service
@@ -13,8 +13,8 @@ After=syslog.target network.target
 [Service]
 Type=simple
 EnvironmentFile=/etc/tomcat/tomcat.conf
-Environment="NAME=%I"
-EnvironmentFile=-/etc/sysconfig/tomcat@%I
+Environment="NAME=%i"
+EnvironmentFile=-/etc/sysconfig/tomcat@%i
 ExecStart=/usr/libexec/tomcat/server start
 ExecStop=/usr/libexec/tomcat/server stop
 SuccessExitStatus=143
diff --git a/tomcat.spec b/tomcat.spec
index e3a816b..77619ca 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -612,6 +612,7 @@ fi
 %changelog
 * Thu Sep 26 2019 Coty Sutherland <csutherl@redhat.com> - 1:9.0.26-1
 - Update to 9.0.26
+- Resolves: rhbz#1523112 tomcat systemd does not cope with - in service names
 
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:9.0.21-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild