diff --git a/component/tomcat/buildout.cfg b/component/tomcat/buildout.cfg
index 8a008b22036b0be81154f79d86aad384029503be..b2497fccffb99d0f533865c09a3739280c8fa1a5 100644
--- a/component/tomcat/buildout.cfg
+++ b/component/tomcat/buildout.cfg
@@ -9,14 +9,22 @@ parts =
 [tomcat]
 <= tomcat6
 
-[tomcat6]
+[tomcat_download]
 recipe = hexagonit.recipe.download
 strip-top-level-dir = true
-url = http://apache.multidist.com/tomcat/tomcat-6/v6.0.36/bin/apache-tomcat-6.0.36.tar.gz
-md5sum = 3dde098fd0b3a08d3f2867e4a95591ba
+mirror_host = http://apache.mirrors.lucidnetworks.net/tomcat/
+
+[tomcat6]
+<= tomcat_download
+url = ${:mirror_host}/tomcat-6/v6.0.43/bin/apache-tomcat-6.0.43.tar.gz
+md5sum = 0abbb1852a608c8b4ccb7003c700337b
 
 [tomcat7]
-recipe = hexagonit.recipe.download
-strip-top-level-dir = true
-url = http://apache.multidist.com/tomcat/tomcat-7/v7.0.34/bin/apache-tomcat-7.0.34.tar.gz
-md5sum = 0f50494425c24450b4f66dfd4d2aecca
+<= tomcat_download
+url = ${:mirror_host}/tomcat-7/v7.0.57/bin/apache-tomcat-7.0.57.tar.gz
+md5sum = d6a07b41203f876440c9a7c8581db153
+
+[tomcat8]
+<= tomcat_download
+url = ${:mirror_host}/tomcat-8/v8.0.15/bin/apache-tomcat-8.0.15.tar.gz
+md5sum = a72c1057e501e50fc4033087a105dfd7