diff --git a/apache-tomcat-9.0.35-src.tar.gz b/apache-tomcat-9.0.35-src.tar.gz
deleted file mode 100644
index b7c31ee..0000000
--- a/apache-tomcat-9.0.35-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:af3e7c573166c500043bb56a97015aaa8ef6454eb7b034dd455e3fd79e16e17b
-size 5887816
diff --git a/apache-tomcat-9.0.35-src.tar.gz.asc b/apache-tomcat-9.0.35-src.tar.gz.asc
deleted file mode 100644
index 0683014..0000000
--- a/apache-tomcat-9.0.35-src.tar.gz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAl6x0M8ACgkQEMAcWi9g
-Wed/axAA0B9nmM56SAvYcDJ7U85k2ohKMHoWyEhZ419wgVskSnKxxkTlMZBCREAv
-mHTi8r/z5Gzyui4s98RaLk34KkL8JefQLec2HiWicA/7T9UtiUnOYoOCM4NFPoBc
-tPCA5nZcsqIOR1Cfj6oKji6Ezezoj7u2ne0rmLXms+gkIQRTOD+uoMQzcUKVbFm4
-dKMSB2Ep2z3D+PAHjPucEjIrbSI5kMuEkU/CKQGRl0jxFGmlev+NDsPBZRgSHV0M
-6AHWKZ/srzxzC1Tz5bz6+6KWYfT4VbIncqFyydXdNgNYaMq+JunMkeYo1NDnZ92C
-fhwEiNui/bA7RABp0DiJKGxHHsZyB6c1pqSWK77mpzh1DCcOvPyce75Uo+u1NGPf
-AFFPND+36WoYCjmzIO5MMwvA5HCbt9JFf48eh2N8R9a2qKiX17laY5H2QyEMBiYa
-0pxjQjm+atVh4muzaRCcQ3qEQ9OYJ5hCflq+3h9C3tSesYNj3yBzd8gvK67R7QoP
-jQrxRvZq8Lx3tAbGZ+c54pa7LKObPC7oOq/TCWAm9h2Pn21qRrpcFosxJ7Tk447G
-XuWHdmBUpTjnjgpkfS8VxhhlCwUZBu7s+pkIQKPmSTtf9YH8EpJw8/qPDSTnjuYi
-cN762/PDzTW49ddDlzqyVkR7IpncXrcGvow14zGTcDnha/iUtEM=
-=yNAA
------END PGP SIGNATURE-----
diff --git a/apache-tomcat-9.0.36-src.tar.gz b/apache-tomcat-9.0.36-src.tar.gz
new file mode 100644
index 0000000..dcb4f8c
--- /dev/null
+++ b/apache-tomcat-9.0.36-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3444bfabf7a4f88b3276d121541129593ac1f871b6d4eaa31104cee098fd9394
+size 5890912
diff --git a/apache-tomcat-9.0.36-src.tar.gz.asc b/apache-tomcat-9.0.36-src.tar.gz.asc
new file mode 100644
index 0000000..17b01fc
--- /dev/null
+++ b/apache-tomcat-9.0.36-src.tar.gz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAl7X294ACgkQEMAcWi9g
+Wedinw/+IaqN35TbauWtNswTV9nwYk76PPphvnnYu87upE9ZwD1xT/qcmT5PD1sM
+08t34laxrawOHJThigK5pmbIcP+P2gWnSwKwS6NH0eT9JQWNJZ92fX4hhR6TFpcE
+TKqzAHPlnqwqijNPNmS8hg58sSxni/ScB7e/Dk8JhGnv4YXSdrjdOcWEC2Igfipo
+sK8cnBuP8nPdB4GnGFYdz34SG9WqNSXIv/4kkMDvP00bm4jvrPcf6dnuAosrtq3l
+ipTIFH7LIfOcC9rSjeOAfvtqDD5hyV1plJdwVE1FYOm0BvCDixvRfKDBbf6Ka9U5
+Y6QGKzfQwrWZMv/COVnoBpKmXTTQNAl0lX97fZP2bhgLvKJB4SClAChrZuOIrMhq
+U4hMFvVd51+YscHXR4idgtIL3sI16XiAoBGStsVLXWstYAmud/EqaQVNwwAdCY13
+YcMjZEHaqyMLMb6rJe305tE0a2pMqErXUKqPuHiNIvaLQN4qa5tw3g/czOQaeJpq
+A3cQeGQQCd4N2clUhgFfr+RGVmA7TUo23/w1zQMjmnjVvn2QFtBOybcKE5kGdGCF
+YmMQ0zD+SuYUR0V0a//xdA24XriG3PfkqJ/x3+eja+P1FlJ5DzJtX2kpk8BotETT
+jVR8IKMQ/mGMkgBmvVVvrVx76qZaCuI/2RG/4SNh/hhBXzPEeQE=
+=Sr54
+-----END PGP SIGNATURE-----
diff --git a/tomcat.changes b/tomcat.changes
index a13a065..cab69bb 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jun 26 08:03:01 UTC 2020 - Fridrich Strba <fstrba@suse.com>
+
+- Update to Tomcat 9.0.36. See changelog at
+  https://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.36_(markt)
+- Fixed CVEs:
+  CVE-2020-11996 (bsc#1173389)
+
 -------------------------------------------------------------------
 Tue May 26 14:58:13 UTC 2020 - Matei Albu <malbu@suse.com>
 
diff --git a/tomcat.spec b/tomcat.spec
index 2563c8a..bf28983 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -22,7 +22,7 @@
 %define elspec 3.0
 %define major_version 9
 %define minor_version 0
-%define micro_version 35
+%define micro_version 36
 %define packdname apache-tomcat-%{version}-src
 # FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/
 %global basedir /srv/%{name}