diff --git a/build.properties b/build.properties
index 8fe441fee..c921d0cd7 100644
--- a/build.properties
+++ b/build.properties
@@ -125,7 +125,5 @@ javac.version=1.6
 #with-libtomcat6-java=true
 # Don't build with bundled tomcat 6, we will use libtomcat7-java package
 #with-libtomcat7-java=true
-# Don't include standard.jar, we will use libjakarta-taglibs-standard-java package
-#with-libjakarta-taglibs-standard-java=true
-# Don't include jstl.jar, we will use libjstl1.1-java package
-#with-libjstl1.1-java=true
+# Don't include jstl.jar and standard.jar, we will use glassfish-javaee package
+#with-glassfish-javaee=true
diff --git a/build.xml b/build.xml
index fd2a6e798..0bd7f40c1 100644
--- a/build.xml
+++ b/build.xml
@@ -64,10 +64,14 @@
             <echo message="In addition to those packages, be sure to install &quot;fakeroot&quot;,"/>
             <echo message="&quot;quilt&quot; and &quot;build-essential&quot;!" />
             <echo message="" />
-            <echo message="The following command will install all of the dependencies for you:" />
+            <echo message="The following command will install the build dependencies for you:" />
             <echo message=" " />
-            <echo message="apt-get install debhelper ant debconf default-jdk gettext libgmp3-dev po-debconf fakeroot build-essential \" />
-            <echo message="                   quilt libcommons-logging-java dh-apparmor dh-systemd libservice-wrapper-java devscripts"  />
+            <echo message="sudo apt-get install debhelper ant debconf default-jdk gettext libgmp-dev po-debconf fakeroot \" />
+            <echo message="  build-essential quilt libcommons-logging-java dh-apparmor dh-systemd libservice-wrapper-java \"  />
+            <echo message="  devscripts libjetty8-java glassfish-javaee"  />
+            <echo message=" " />
+            <echo message="The following command will install the additional runtime dependencies:" />
+            <echo message="sudo apt-get install libecj-java geoip-database" />
             <echo message=" " />
             <echo message="Once the dependencies are installed, run &quot;ant debian&quot;"/>
             <echo message="to patch the source and build the packages." />
@@ -1217,11 +1221,11 @@
         </copy>
     </target>
 
-    <target name="copyjstl-unlesspkg" unless="${with-libjstl1.1-java}" >
+    <target name="copyjstl-unlesspkg" unless="${with-glassfish-javaee}" >
         <copy file="apps/susidns/src/WEB-INF/lib/jstl.jar" todir="pkg-temp/lib/" />
     </target>
 
-    <target name="copystandard-unlesspkg" unless="${with-libjakarta-taglibs-standard-java}" >
+    <target name="copystandard-unlesspkg" unless="${with-glassfish-javaee}" >
         <copy file="apps/susidns/src/WEB-INF/lib/standard.jar" todir="pkg-temp/lib/" />
     </target>
 
@@ -2013,11 +2017,11 @@
             <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
             <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
             <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" />
+            <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/jstl.jar" />
+            <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/standard.jar" />
           <!--
             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
-            <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/jstl.jar" />
-            <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/standard.jar" />
            -->
             <!-- anything added above, add in debian-release-tarball also -->
         </delete>
@@ -2030,11 +2034,11 @@
                 <exclude name="installer/resources/geoip.txt"/>
                 <exclude name="installer/resources/geoipv6.dat.gz"/>
                 <exclude name="apps/jetty/jetty-distribution-*/**"/>
+                <exclude name="apps/susidns/src/WEB-INF/lib/jstl.jar" />
+                <exclude name="apps/susidns/src/WEB-INF/lib/standard.jar" />
           <!--
                 <exclude name="apps/jetty/apache-tomcat/**"/>
                 <exclude name="apps/jetty/apache-tomcat-deployer/**"/>
-                <exclude name="apps/susidns/src/WEB-INF/lib/jstl.jar" />
-                <exclude name="apps/susidns/src/WEB-INF/lib/standard.jar" />
            -->
                 <!-- anything added above, add in debian-release-tarball also -->
             </tarfileset>
@@ -2073,11 +2077,11 @@
             <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
             <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
             <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" />
+            <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/jstl.jar" />
+            <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/standard.jar" />
           <!--
             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
-            <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/jstl.jar" />
-            <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/standard.jar" />
            -->
             <!-- anything added above, add in debian-tarball also -->
         </delete>
@@ -2090,11 +2094,11 @@
                 <exclude name="installer/resources/geoip.txt"/>
                 <exclude name="installer/resources/geoipv6.dat.gz"/>
                 <exclude name="apps/jetty/jetty-distribution-*/**"/>
+                <exclude name="apps/susidns/src/WEB-INF/lib/jstl.jar" />
+                <exclude name="apps/susidns/src/WEB-INF/lib/standard.jar" />
           <!--
                 <exclude name="apps/jetty/apache-tomcat/**"/>
                 <exclude name="apps/jetty/apache-tomcat-deployer/**"/>
-                <exclude name="apps/susidns/src/WEB-INF/lib/jstl.jar" />
-                <exclude name="apps/susidns/src/WEB-INF/lib/standard.jar" />
            -->
                 <!-- anything added above, add in debian-tarball also -->
             </tarfileset>
diff --git a/debian-alt/doc/debian-build.txt b/debian-alt/doc/debian-build.txt
index d7b51b5d2..bdaa00f29 100644
--- a/debian-alt/doc/debian-build.txt
+++ b/debian-alt/doc/debian-build.txt
@@ -64,3 +64,9 @@ reprepro includedeb unstable libjbigi-jni_0.9.xx-1_amd64.deb
 # if you already got the source from launchpad
 # with reprepro update, skip this?
 reprepro includedsc unstable i2p_0.9.XX-1.dsc
+
+
+# To copy precise to wheezy if you build precise on launchpad
+# and then did a reprepro update:
+# Note that syntax is reprepro copysrc TO FROM package!
+reprepro copysrc wheezy precise i2p
diff --git a/debian/control b/debian/control
index cbd1866f1..7cd59604d 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Build-Depends: debhelper (>= 7.0.50~)
  ,debconf
  ,openjdk-7-jdk
  ,libjetty8-java, libservlet3.0-java
+ ,glassfish-javaee
  ,dh-apparmor
  ,gettext
  ,libgmp-dev (>= 2:5.0.5)
@@ -74,7 +75,8 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
  openjdk-8-jre-headless | openjdk-7-jre-headless | default-jre-headless | java8-runtime-headless | java7-runtime-headless,
  libecj-java,
  geoip-database,
- libjetty8-java, libservlet3.0-java
+ libjetty8-java, libservlet3.0-java,
+ glassfish-javaee
 Replaces: i2p ( << 0.8.6-5)
 Breaks: i2p (<< 0.8.6-5)
 Recommends: libjbigi-jni, ttf-dejavu
diff --git a/debian/i2p-router.install b/debian/i2p-router.install
index 162dcf8f8..ec197db9c 100644
--- a/debian/i2p-router.install
+++ b/debian/i2p-router.install
@@ -36,7 +36,7 @@ pkg-temp/lib/systray.jar usr/share/i2p/lib
 
 
 # uncomment if not building with libjetty8-java
-# ubuntu: only in wily
+# ubuntu: in trusty vivid wily xenial
 # debian: in wheezy jessie stretch sid
 #pkg-temp/lib/jetty-continuation.jar usr/share/i2p/lib
 #pkg-temp/lib/jetty-deploy.jar usr/share/i2p/lib
@@ -71,13 +71,7 @@ pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
 pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
 
 
-# uncomment if not building with libjakarta-taglibs-standard-java
-# ubuntu: only in wily
-# debian: in wheezy jessie stretch sid
-pkg-temp/lib/jstl.jar usr/share/i2p/lib
-
-
-# uncomment if not building with libjstl1.1-java
-# ubuntu: in precise trusty vivid wily xenial
-# debian: in wheezy jessie stretch sid
-pkg-temp/lib/standard.jar usr/share/i2p/lib
+# uncomment if not building with glassfish-javaee
+# ubuntu and debian: everywhere
+#pkg-temp/lib/jstl.jar usr/share/i2p/lib
+#pkg-temp/lib/standard.jar usr/share/i2p/lib
diff --git a/debian/i2p-router.links b/debian/i2p-router.links
index 719c32917..e3e6ce81f 100644
--- a/debian/i2p-router.links
+++ b/debian/i2p-router.links
@@ -7,7 +7,7 @@ usr/share/java/eclipse-ecj.jar /usr/share/i2p/lib/eclipse-ecj.jar
 
 
 # comment out if not building with libjetty8-java
-# ubuntu: only in wily
+# ubuntu: in trusty vivid wily xenial
 # debian: in wheezy jessie stretch sid
 usr/share/java/jetty8-continuation.jar usr/share/i2p/lib/jetty-continuation.jar
 usr/share/java/jetty8-deploy.jar usr/share/i2p/lib/jetty-deploy.jar
@@ -50,13 +50,7 @@ usr/share/java/jsp-api-2.2.jar usr/share/i2p/lib/jsp-api.jar
 #usr/share/java/tomcat-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
 
 
-# comment out if not building with libjakarta-taglibs-standard-java
-# ubuntu: only in wily
-# debian: in wheezy jessie stretch sid
-#usr/share/java/standard.jar usr/share/i2p/lib/standard.jar
-
-
-# comment out if not building with libjstl1.1-java
-# ubuntu: in precise trusty vivid wily xenial
-# debian: in wheezy jessie stretch sid
-#usr/share/java/jstl1.1.jar usr/share/i2p/lib/jstl.jar
+# comment out if not building with glassfish-javaee
+# ubuntu and debian: everywhere
+usr/share/java/glassfish-javaee.jar usr/share/i2p/lib/jstl.jar
+usr/share/java/glassfish-appserv-jstl.jar usr/share/i2p/lib/standard.jar
diff --git a/debian/rules b/debian/rules
index db4538f6c..3012cdf66 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,17 +72,17 @@ ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" ""
 else
 	@echo "Already found deb in version, not doing anything"
 endif
-	# build options
+	@# build options
 	@/bin/echo -e "javac.version=1.7" > $(CURDIR)/override.properties
 	@/bin/echo -e "javac.compilerargs=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
 	@/bin/echo -e "javac.compilerargs7=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
 	@/bin/echo -e "build.built-by=debian" >> $(CURDIR)/override.properties
 
-	# debian and ubuntu: everywhere
+	@# debian and ubuntu: everywhere
 	@/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties
 
-	# ubuntu: only in wily
-	# debian: in wheezy jessie stretch sid
+	@# ubuntu: not in precise
+	@# debian: in wheezy jessie stretch sid
 	@/bin/echo -e "with-libjetty8-java=true" >> $(CURDIR)/override.properties
 	mkdir -p $(CURDIR)/apps/jetty/jettylib
 	ln -sf /usr/share/java/jetty8-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
@@ -99,41 +99,37 @@ endif
 	ln -sf /usr/share/java/jetty8-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
 	ln -sf /usr/share/java/jetty8-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
 	ln -sf /usr/share/java/jetty8-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
-	# following two are from libservlet3.0-java which is a dependency of libjetty8-java
+	@# following two are from libservlet3.0-java which is a dependency of libjetty8-java
 	ln -sf /usr/share/java/servlet-api-3.0.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
 	ln -sf /usr/share/java/jsp-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
 
-	# ubuntu: only in wily
-	# debian: in wheezy jessie stretch sid
-	#mkdir -p $(CURDIR)/apps/jetty/jettylib
-	#@/bin/echo -e "with-libservlet2.5-java=true" >> $(CURDIR)/override.properties
-	#ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
+	@# ubuntu: only in wily
+	@# debian: in wheezy jessie stretch sid
+	@#mkdir -p $(CURDIR)/apps/jetty/jettylib
+	@#@/bin/echo -e "with-libservlet2.5-java=true" >> $(CURDIR)/override.properties
+	@#ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
 
-	# ubuntu: only in precise trusty vivid
-	# debian: only in wheezy
-	#@/bin/echo -e "with-libtomcat6-java=true" >> $(CURDIR)/override.properties
-	#mkdir -p $(CURDIR)/apps/jetty/jettylib
-	#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
-	#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
-	#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
-	#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
+	@# ubuntu: only in precise trusty vivid
+	@# debian: only in wheezy
+	@#@/bin/echo -e "with-libtomcat6-java=true" >> $(CURDIR)/override.properties
+	@#mkdir -p $(CURDIR)/apps/jetty/jettylib
+	@#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
+	@#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
+	@#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
+	@#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
 
-	# debian and ubuntu: everywhere
-	#@/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
-	#mkdir -p $(CURDIR)/apps/jetty/jettylib
-	#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
-	#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
-	#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
-	#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
+	@# debian and ubuntu: everywhere
+	@#@/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
+	@#mkdir -p $(CURDIR)/apps/jetty/jettylib
+	@#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
+	@#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
+	@#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
+	@#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
 
-	# ubuntu: only in wily
-	# debian: in wheezy jessie stretch sid
-	#@/bin/echo -e "with-libjakarta-taglibs-standard-java=true" >> $(CURDIR)/override.properties
-	#ln -sf /usr/share/java/standard.jar $(CURDIR)/apps/susidns/src/WEB-INF/lib/standard.jar
-
-	# debian and ubuntu: everywhere
-	#@/bin/echo -e "with-libjstl1.1-java=true" >> $(CURDIR)/override.properties
-	#ln -sf /usr/share/java/jstl1.1.jar $(CURDIR)/apps/susidns/src/WEB-INF/lib/jstl.jar
+	@# debian and ubuntu: everywhere
+	@/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties
+	ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/WEB-INF/lib/jstl.jar
+	ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/WEB-INF/lib/standard.jar
 
 	TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc
 	echo router.updateDisabled=true > $(I2P)/router.config