diff --git a/LICENSE.txt b/LICENSE.txt
index b8a32c32477d32de580937714a2f432b628d8999..6edcfdcd13d234a807124e0d47270b727a5d3051 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -210,7 +210,7 @@ Applications:
      Zxing:
        See licenses/LICENSE-Apache2.0.txt
 
-   Jetty 8.1.17.v20150415:
+   Jetty 8.1.21.v20160908:
    See licenses/ABOUT-Jetty.html
    See licenses/NOTICE-Jetty.html
    See licenses/LICENSE-Apache2.0.txt
diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml
index 6f1f4873aa0b54a2c304e81d5cfc37ea02c74702..0f213c39a49c6dae9784f1bb09360cb24d73a518 100644
--- a/apps/jetty/build.xml
+++ b/apps/jetty/build.xml
@@ -13,11 +13,11 @@
          the source in the java/ directory.
      -->
 
-    <property name="jetty.ver" value="8.1.17.v20150415" />
+    <property name="jetty.ver" value="8.1.21.v20160908" />
     <property name="jetty.base" value="jetty-distribution-${jetty.ver}" />
-    <property name="jetty.sha1" value="ce7bcd1bdcdac4cf130467f6d55155b9e1517e71" />
+    <property name="jetty.sha1" value="9780e99e765fd7b9bb1aac8ba2bba374ac039764" />
     <property name="jetty.filename" value="${jetty.base}.zip" />
-    <property name="jetty.url" value="http://download.eclipse.org/jetty/${jetty.ver}/dist/${jetty.filename}" />
+    <property name="jetty.url" value="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jetty.ver}/${jetty.filename}" />
     <property name="verified.filename" value="verified.txt" />
     <property name="javac.compilerargs" value="" />
     <property name="javac.version" value="1.6" />
diff --git a/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-continuation-8.1.17.v20150415.jar b/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-continuation-8.1.17.v20150415.jar
deleted file mode 100644
index 8cbc69c458720cff2aae13edda5c080aaf879c6e..0000000000000000000000000000000000000000
Binary files a/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-continuation-8.1.17.v20150415.jar and /dev/null differ
diff --git a/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-deploy-8.1.17.v20150415.jar b/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-deploy-8.1.17.v20150415.jar
deleted file mode 100644
index 14ea49b682adc151dde2fdf4dd507de53ed311c9..0000000000000000000000000000000000000000
Binary files a/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-deploy-8.1.17.v20150415.jar and /dev/null differ
diff --git a/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-http-8.1.17.v20150415.jar b/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-http-8.1.17.v20150415.jar
deleted file mode 100644
index bb76df05351d585183cf90b4659b337a80d4d848..0000000000000000000000000000000000000000
Binary files a/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-http-8.1.17.v20150415.jar and /dev/null differ
diff --git a/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-io-8.1.17.v20150415.jar b/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-io-8.1.17.v20150415.jar
deleted file mode 100644
index 31c82be1ff317775cf0656109edc54b2fd9e61a2..0000000000000000000000000000000000000000
Binary files a/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-io-8.1.17.v20150415.jar and /dev/null differ
diff --git a/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-rewrite-8.1.17.v20150415.jar b/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-rewrite-8.1.17.v20150415.jar
deleted file mode 100644
index ae0199cd51668e0e0b63a86c34e356d07bc525d1..0000000000000000000000000000000000000000
Binary files a/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-rewrite-8.1.17.v20150415.jar and /dev/null differ
diff --git a/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-security-8.1.17.v20150415.jar b/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-security-8.1.17.v20150415.jar
deleted file mode 100644
index bda9b33598ef1abcab9174f45ff658640e83fe7c..0000000000000000000000000000000000000000
Binary files a/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-security-8.1.17.v20150415.jar and /dev/null differ
diff --git a/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-server-8.1.17.v20150415.jar b/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-server-8.1.17.v20150415.jar
deleted file mode 100644
index af68d0201a7a5ef40c44c26706a5bf5a14442883..0000000000000000000000000000000000000000
Binary files a/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-server-8.1.17.v20150415.jar and /dev/null differ
diff --git a/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-servlet-8.1.17.v20150415.jar b/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-servlet-8.1.17.v20150415.jar
deleted file mode 100644
index 49ae8322c50079aa3dea635c4a58e1a0b0953ba6..0000000000000000000000000000000000000000
Binary files a/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-servlet-8.1.17.v20150415.jar and /dev/null differ
diff --git a/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-servlets-8.1.17.v20150415.jar b/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-servlets-8.1.17.v20150415.jar
deleted file mode 100644
index 14ded3b480daebb865b23aa08a472a9b864b829b..0000000000000000000000000000000000000000
Binary files a/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-servlets-8.1.17.v20150415.jar and /dev/null differ
diff --git a/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-util-8.1.17.v20150415.jar b/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-util-8.1.17.v20150415.jar
deleted file mode 100644
index a1f7d1efd94d58fe41a6185ec03df96417067e91..0000000000000000000000000000000000000000
Binary files a/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-util-8.1.17.v20150415.jar and /dev/null differ
diff --git a/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-webapp-8.1.17.v20150415.jar b/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-webapp-8.1.17.v20150415.jar
deleted file mode 100644
index 97455d7c7c11a6dc8ebd601466a9f24dc2b06c66..0000000000000000000000000000000000000000
Binary files a/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-webapp-8.1.17.v20150415.jar and /dev/null differ
diff --git a/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-xml-8.1.17.v20150415.jar b/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-xml-8.1.17.v20150415.jar
deleted file mode 100644
index d174d0b0e407b5da366353192422e4410f083c3b..0000000000000000000000000000000000000000
Binary files a/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-xml-8.1.17.v20150415.jar and /dev/null differ
diff --git a/apps/jetty/jetty-distribution-8.1.17.v20150415/start.jar b/apps/jetty/jetty-distribution-8.1.17.v20150415/start.jar
deleted file mode 100644
index 979c22d7ddc8b4df5128896ea33adf35c5bf99a2..0000000000000000000000000000000000000000
Binary files a/apps/jetty/jetty-distribution-8.1.17.v20150415/start.jar and /dev/null differ
diff --git a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-continuation-8.1.21.v20160908.jar b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-continuation-8.1.21.v20160908.jar
new file mode 100644
index 0000000000000000000000000000000000000000..ef8b5f4dc1688a1079a15e591c63394eb54c5c8e
Binary files /dev/null and b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-continuation-8.1.21.v20160908.jar differ
diff --git a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-deploy-8.1.21.v20160908.jar b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-deploy-8.1.21.v20160908.jar
new file mode 100644
index 0000000000000000000000000000000000000000..1df83b801aa83d2d3733761d812100e305dd9447
Binary files /dev/null and b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-deploy-8.1.21.v20160908.jar differ
diff --git a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-http-8.1.21.v20160908.jar b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-http-8.1.21.v20160908.jar
new file mode 100644
index 0000000000000000000000000000000000000000..6bbb4224c19ce638f2d70501880464e21b02dc37
Binary files /dev/null and b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-http-8.1.21.v20160908.jar differ
diff --git a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-io-8.1.21.v20160908.jar b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-io-8.1.21.v20160908.jar
new file mode 100644
index 0000000000000000000000000000000000000000..502691d379271587a755c0cc21668c934772a3da
Binary files /dev/null and b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-io-8.1.21.v20160908.jar differ
diff --git a/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-jmx-8.1.17.v20150415.jar b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-jmx-8.1.21.v20160908.jar
similarity index 66%
rename from apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-jmx-8.1.17.v20150415.jar
rename to apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-jmx-8.1.21.v20160908.jar
index 54466581c4d5d0723804ce1096d2d0cda4311b1f..9a5a0309042201f2b9731ba3d5a03e8b4e11d72a 100644
Binary files a/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-jmx-8.1.17.v20150415.jar and b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-jmx-8.1.21.v20160908.jar differ
diff --git a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-rewrite-8.1.21.v20160908.jar b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-rewrite-8.1.21.v20160908.jar
new file mode 100644
index 0000000000000000000000000000000000000000..a2a145408e91bdf3695b65e346d045a2609efbf7
Binary files /dev/null and b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-rewrite-8.1.21.v20160908.jar differ
diff --git a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-security-8.1.21.v20160908.jar b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-security-8.1.21.v20160908.jar
new file mode 100644
index 0000000000000000000000000000000000000000..dcacc12ade65ed3de9e365abe8f276a12f6af256
Binary files /dev/null and b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-security-8.1.21.v20160908.jar differ
diff --git a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-server-8.1.21.v20160908.jar b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-server-8.1.21.v20160908.jar
new file mode 100644
index 0000000000000000000000000000000000000000..0a99f8497450e28d21735d2fc9213052a8676ac4
Binary files /dev/null and b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-server-8.1.21.v20160908.jar differ
diff --git a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-servlet-8.1.21.v20160908.jar b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-servlet-8.1.21.v20160908.jar
new file mode 100644
index 0000000000000000000000000000000000000000..1e563538c006d8c504916454a9ea184e672fc8a7
Binary files /dev/null and b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-servlet-8.1.21.v20160908.jar differ
diff --git a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-servlets-8.1.21.v20160908.jar b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-servlets-8.1.21.v20160908.jar
new file mode 100644
index 0000000000000000000000000000000000000000..28e4fe6c27732d03fd3d148a6342ce5524b02dd4
Binary files /dev/null and b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-servlets-8.1.21.v20160908.jar differ
diff --git a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-util-8.1.21.v20160908.jar b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-util-8.1.21.v20160908.jar
new file mode 100644
index 0000000000000000000000000000000000000000..646b23b0f1b2bfee5d4fa66d3df8364d3ba08da2
Binary files /dev/null and b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-util-8.1.21.v20160908.jar differ
diff --git a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-webapp-8.1.21.v20160908.jar b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-webapp-8.1.21.v20160908.jar
new file mode 100644
index 0000000000000000000000000000000000000000..b8d340f32d97d0968ce3cbbca6cf10e533e8478a
Binary files /dev/null and b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-webapp-8.1.21.v20160908.jar differ
diff --git a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-xml-8.1.21.v20160908.jar b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-xml-8.1.21.v20160908.jar
new file mode 100644
index 0000000000000000000000000000000000000000..1bedc9e62e63980b67d760b96e2130b2cd2a5c16
Binary files /dev/null and b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-xml-8.1.21.v20160908.jar differ
diff --git a/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar
similarity index 100%
rename from apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar
rename to apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar
diff --git a/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/servlet-api-3.0.jar b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/servlet-api-3.0.jar
similarity index 100%
rename from apps/jetty/jetty-distribution-8.1.17.v20150415/lib/servlet-api-3.0.jar
rename to apps/jetty/jetty-distribution-8.1.21.v20160908/lib/servlet-api-3.0.jar
diff --git a/apps/jetty/jetty-distribution-8.1.21.v20160908/start.jar b/apps/jetty/jetty-distribution-8.1.21.v20160908/start.jar
new file mode 100644
index 0000000000000000000000000000000000000000..43442c44572ab7dd7386115216e37e5fa55a31fe
Binary files /dev/null and b/apps/jetty/jetty-distribution-8.1.21.v20160908/start.jar differ