diff --git a/tomcat.spec b/tomcat.spec
index bd0b3c9..2f01ef7 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -42,6 +42,7 @@ Source32:      tomcat-named.service
 Patch0:        %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch
 Patch1:        %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
 Patch2:        %{name}-build.patch
+Patch3:	       disableJavadocFailOnWarning.patch
 Patch6001: CVE-2019-0199-1.patch
 Patch6002: CVE-2019-0199-2.patch
 Patch6003: CVE-2019-0199-3.patch
@@ -130,7 +131,7 @@ Man pages and other related documents for %{name}.
 find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \
    -name "*.jar" -o -name "*.war" -o -name "*.zip" \) -delete
 
-%autosetup -p1 -n %{packdname}
+%autosetup -p1 -n %{name}-%{version}
 
 ln -s $(build-classpath tomcat-taglibs-standard/taglibs-standard-impl) webapps/examples/WEB-INF/lib/jstl.jar
 ln -s $(build-classpath tomcat-taglibs-standard/taglibs-standard-compat) webapps/examples/WEB-INF/lib/standard.jar