diff --git a/pki-servlet-container.spec b/pki-servlet-container.spec
index 24cf81b..6cba1f0 100644
--- a/pki-servlet-container.spec
+++ b/pki-servlet-container.spec
@@ -95,7 +95,6 @@ BuildRequires: ant
 BuildRequires: ecj >= 1:4.6.3
 BuildRequires: findutils
 BuildRequires: apache-commons-collections
-BuildRequires: apache-commons-daemon
 BuildRequires: apache-commons-dbcp
 BuildRequires: apache-commons-pool
 BuildRequires: java-devel >= 1:1.8.0
@@ -110,7 +109,6 @@ BuildRequires: geronimo-jaxrpc
 BuildRequires: wsdl4j
 BuildRequires: systemd-units
 
-Requires:      apache-commons-daemon
 Requires:      apache-commons-collections
 Requires:      apache-commons-dbcp
 Requires:      apache-commons-pool
@@ -191,7 +189,7 @@ export OPT_JAR_LIST="xalan-j2-serializer"
    %{ant} -Dbase.path="." \
       -Dbuild.compiler="modern" \
       -Dcommons-collections.jar="$(build-classpath apache-commons-collections)" \
-      -Dcommons-daemon.jar="$(build-classpath apache-commons-daemon)" \
+      -Dcommons-daemon.jar="HACK" \
       -Dcommons-daemon.native.src.tgz="HACK" \
       -Djdt.jar="$(build-classpath ecj)" \
       -Dtomcat-native.tar.gz="HACK" \
diff --git a/tomcat-9.0-digest.script b/tomcat-9.0-digest.script
index ce4aa0f..731d4cf 100644
--- a/tomcat-9.0-digest.script
+++ b/tomcat-9.0-digest.script
@@ -34,7 +34,7 @@ export CLASSPATH
 MAIN_CLASS="org.apache.catalina.startup.Tool"
 BASE_FLAGS="-Dcatalina.home=\"$CATALINA_HOME\""
 BASE_OPTIONS=""
-BASE_JARS="commons-daemon tomcat/catalina servlet tomcat/tomcat-util tomcat/tomcat-coyote tomcat/tomcat-api tomcat/tomcat-util-scan"
+BASE_JARS="tomcat/catalina servlet tomcat/tomcat-util tomcat/tomcat-coyote tomcat/tomcat-api tomcat/tomcat-util-scan"
 
 # Set parameters
 set_classpath $BASE_JARS
diff --git a/tomcat-9.0-tool-wrapper.script b/tomcat-9.0-tool-wrapper.script
index 949d46d..40e39ff 100644
--- a/tomcat-9.0-tool-wrapper.script
+++ b/tomcat-9.0-tool-wrapper.script
@@ -34,7 +34,7 @@ export CLASSPATH
 MAIN_CLASS="org.apache.catalina.startup.Tool"
 BASE_OPTIONS=""
 BASE_FLAGS="-Dcatalina.home=\"$CATALINA_HOME\""
-BASE_JARS="commons-daemon tomcat/catalina servlet tomcat/tomcat-util tomcat/tomcat-coyote tomcat/tomcat-api tomcat/tomcat-util-scan"
+BASE_JARS="tomcat/catalina servlet tomcat/tomcat-util tomcat/tomcat-coyote tomcat/tomcat-api tomcat/tomcat-util-scan"
 
 # Set parameters
 set_classpath $BASE_JARS