diff --git a/.tx/config b/.tx/config
index 53f7a8884f..451f7b95f1 100644
--- a/.tx/config
+++ b/.tx/config
@@ -451,8 +451,9 @@ trans.zh_CN = installer/resources/locale-man/man_zh.po
 
 [I2P.eepsite]
 ;;
-;; For any new translations, add links in index.html
-;; and copy new flags in build.xml preppkg-base target
+;; For any new translations, add links in index.html,
+;; and copy new flags in build.xml copyflags-unlesspkg target,
+;; and add to debian/i2p-router.links and debian-alt/*/i2p-router.links
 ;;
 type = HTML
 source_file = installer/resources/eepsite/docroot/help/index.html
diff --git a/build.properties b/build.properties
index d83b97727d..04cc698e84 100644
--- a/build.properties
+++ b/build.properties
@@ -158,6 +158,8 @@ javac.version=1.7
 #with-gettext-base=true
 # Don't compile gnu.getopt classes, we will use libgetopt-java package
 #with-libgetopt-java=true
+# Don't bundle flags, we will use famfamfam-flag-png package
+#with-famfamfam-flag-png=true
 # Don't compile org.apache.http classes, we will use libhttpclient-java and libhttpcore-java packages
 # 2 MB of dependencies vs. 20 KB of copied source
 # Requires 4.4 or higher.
diff --git a/build.xml b/build.xml
index e4cca1a23d..98f5285eb6 100644
--- a/build.xml
+++ b/build.xml
@@ -1279,7 +1279,7 @@
     </target>
 
     <!-- see targets below for conditional copying -->
-    <target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates, prepRouterInfos, copyjetty, copytomcat-unlesspkg, copyjstl-unlesspkg, copystandard-unlesspkg, truncatehistory">
+    <target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates, prepRouterInfos, copyjetty, copytomcat-unlesspkg, copyjstl-unlesspkg, copystandard-unlesspkg, copyflags-unlesspkg, truncatehistory">
         <!-- if updater200 was run previously, it left *.pack files in pkg-temp -->
         <!-- Also remove deletelist.txt used for updater only -->
         <delete>
@@ -1325,10 +1325,13 @@
         <copy todir="pkg-temp/eepsite/" >
             <fileset dir="installer/resources/eepsite/" excludes="**/.placeholder" />
         </copy>
+        <copy file="installer/resources/themes/console/images/favicon.ico" tofile="pkg-temp/eepsite/docroot/favicon.ico" />
+    </target>
+
+    <target name="copyflags-unlesspkg" unless="${with-famfamfam-flag-png}" >
         <copy todir="pkg-temp/eepsite/docroot/help/lib/" >
             <fileset dir="installer/resources/icons/flags/" includes="az.png cn.png de.png es.png fr.png ir.png it.png jp.png nl.png pl.png pt.png ru.png se.png us.png" />
         </copy>
-        <copy file="installer/resources/themes/console/images/favicon.ico" tofile="pkg-temp/eepsite/docroot/favicon.ico" />
         <copy todir="pkg-temp/docs/icons/flags" >
           <!-- base flags/ dir only. flags16x11/ and flags48x48/ dirs already copied by prepConsoleDocs target -->
           <fileset dir="installer/resources/icons/flags" />
@@ -2410,6 +2413,7 @@
             <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
             <!-- libjakarta-taglibs-standard-java or glassfish-javaee or libtaglibs-standard -->
             <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
+            <fileset dir="../i2p-${Extended.Version}/installer/resources/icons/flags" />
             <!-- anything added above, add in debian-release-tarball also -->
         </delete>
         <tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2">
@@ -2493,6 +2497,7 @@
            -->
             <!-- libjakarta-taglibs-standard-java or glassfish-javaee -->
             <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
+            <!-- famfamfam-flag-png is in trusty but not precise, so leave them in the source package for both -->
             <!-- anything added above, add in debian-release-tarball also -->
         </delete>
         <tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2">
@@ -2569,6 +2574,7 @@
             <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
            -->
             <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
+            <fileset dir="../i2p-${Extended.Version}/installer/resources/icons/flags" />
             <!-- anything added above, add in debian-tarball also -->
         </delete>
         <tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2">
@@ -2639,6 +2645,7 @@
             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.30" />
             <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
             <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
+            <fileset dir="../i2p-${Extended.Version}/installer/resources/icons/flags" />
             <!-- anything added above, add in debian-tarball also -->
         </delete>
         <tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2">
diff --git a/debian-alt/buster/control b/debian-alt/buster/control
index c099951bde..f835e41801 100644
--- a/debian-alt/buster/control
+++ b/debian-alt/buster/control
@@ -81,6 +81,7 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
  libjetty9-java,
  libtaglibs-standard-jstlel-java,
  libtomcat8-java,
+ famfamfam-flag-png
 Replaces: i2p ( << 0.8.6-5)
 Breaks: i2p (<< 0.8.6-5)
 Recommends: libjbigi-jni, ttf-dejavu
diff --git a/debian-alt/buster/rules b/debian-alt/buster/rules
index 24c588d5a0..56bf2f0fe0 100755
--- a/debian-alt/buster/rules
+++ b/debian-alt/buster/rules
@@ -154,6 +154,9 @@ endif
 	@mkdir -p $(CURDIR)/core/java/build
 	ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
 
+	@# debian: everywhere; ubuntu: trusty+
+	@/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties
+
 	@# 2 MB of dependencies vs. 20 KB of copied source
 	@# Requires 4.4 or higher.
 	@# Debian: Not in wheezy/jessie
diff --git a/debian-alt/jessie/control b/debian-alt/jessie/control
index 0f3361e865..3ba1670167 100644
--- a/debian-alt/jessie/control
+++ b/debian-alt/jessie/control
@@ -79,6 +79,7 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
  geoip-database,
  gettext-base,
  libgetopt-java,
+ famfamfam-flag-png
 Replaces: i2p ( << 0.8.6-5)
 Breaks: i2p (<< 0.8.6-5)
 Recommends: libjbigi-jni, ttf-dejavu
diff --git a/debian-alt/jessie/i2p-router.links b/debian-alt/jessie/i2p-router.links
index d85cf86ee3..347e03edfa 100644
--- a/debian-alt/jessie/i2p-router.links
+++ b/debian-alt/jessie/i2p-router.links
@@ -76,6 +76,23 @@ usr/share/java/libintl.jar usr/share/i2p/lib/libintl.jar
 usr/share/java/gnu-getopt.jar usr/share/i2p/lib/gnu-getopt.jar
 
 
+# comment out if not building with famfamfam-flag-png
+# ubuntu: trusty+
+# debian: everywhere
+usr/share/flags/countries/16x11 usr/share/i2p/docs/icons/flags
+usr/share/flags/countries/16x11/az.png usr/share/i2p/eepsite/docroot/help/lib/az.png
+usr/share/flags/countries/16x11/cn.png usr/share/i2p/eepsite/docroot/help/lib/cn.png
+usr/share/flags/countries/16x11/de.png usr/share/i2p/eepsite/docroot/help/lib/de.png
+usr/share/flags/countries/16x11/es.png usr/share/i2p/eepsite/docroot/help/lib/es.png
+usr/share/flags/countries/16x11/fr.png usr/share/i2p/eepsite/docroot/help/lib/fr.png
+usr/share/flags/countries/16x11/nl.png usr/share/i2p/eepsite/docroot/help/lib/nl.png
+usr/share/flags/countries/16x11/pl.png usr/share/i2p/eepsite/docroot/help/lib/pl.png
+usr/share/flags/countries/16x11/pt.png usr/share/i2p/eepsite/docroot/help/lib/pt.png
+usr/share/flags/countries/16x11/ru.png usr/share/i2p/eepsite/docroot/help/lib/ru.png
+usr/share/flags/countries/16x11/se.png usr/share/i2p/eepsite/docroot/help/lib/se.png
+usr/share/flags/countries/16x11/us.png usr/share/i2p/eepsite/docroot/help/lib/us.png
+
+
 # comment out if not building with libhttpclient-java and libhttpcore-java
 # 2 MB of dependencies vs. 20 KB of copied source
 # Requires 4.4 or higher.
diff --git a/debian-alt/jessie/rules b/debian-alt/jessie/rules
index 95e0bdc83c..574e62fdec 100755
--- a/debian-alt/jessie/rules
+++ b/debian-alt/jessie/rules
@@ -143,6 +143,9 @@ endif
 	@mkdir -p $(CURDIR)/core/java/build
 	ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
 
+	@# debian: everywhere; ubuntu: trusty+
+	@/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties
+
 	@# 2 MB of dependencies vs. 20 KB of copied source
 	@# Requires 4.4 or higher.
 	@# Debian: Not in wheezy/jessie
diff --git a/debian-alt/trusty/control b/debian-alt/trusty/control
index 8869916af9..f42e78e537 100644
--- a/debian-alt/trusty/control
+++ b/debian-alt/trusty/control
@@ -80,7 +80,8 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
  geoip-database,
  gettext-base,
  libgetopt-java,
- glassfish-javaee
+ glassfish-javaee,
+ famfamfam-flag-png
 Replaces: i2p ( << 0.8.6-5)
 Breaks: i2p (<< 0.8.6-5)
 Recommends: libjbigi-jni, ttf-dejavu
diff --git a/debian-alt/trusty/i2p-router.links b/debian-alt/trusty/i2p-router.links
index f89ae3bd7d..c0dfed08a3 100644
--- a/debian-alt/trusty/i2p-router.links
+++ b/debian-alt/trusty/i2p-router.links
@@ -76,6 +76,23 @@ usr/share/java/libintl.jar usr/share/i2p/lib/libintl.jar
 usr/share/java/gnu-getopt.jar usr/share/i2p/lib/gnu-getopt.jar
 
 
+# comment out if not building with famfamfam-flag-png
+# ubuntu: trusty+
+# debian: everywhere
+usr/share/flags/countries/16x11 usr/share/i2p/docs/icons/flags
+usr/share/flags/countries/16x11/az.png usr/share/i2p/eepsite/docroot/help/lib/az.png
+usr/share/flags/countries/16x11/cn.png usr/share/i2p/eepsite/docroot/help/lib/cn.png
+usr/share/flags/countries/16x11/de.png usr/share/i2p/eepsite/docroot/help/lib/de.png
+usr/share/flags/countries/16x11/es.png usr/share/i2p/eepsite/docroot/help/lib/es.png
+usr/share/flags/countries/16x11/fr.png usr/share/i2p/eepsite/docroot/help/lib/fr.png
+usr/share/flags/countries/16x11/nl.png usr/share/i2p/eepsite/docroot/help/lib/nl.png
+usr/share/flags/countries/16x11/pl.png usr/share/i2p/eepsite/docroot/help/lib/pl.png
+usr/share/flags/countries/16x11/pt.png usr/share/i2p/eepsite/docroot/help/lib/pt.png
+usr/share/flags/countries/16x11/ru.png usr/share/i2p/eepsite/docroot/help/lib/ru.png
+usr/share/flags/countries/16x11/se.png usr/share/i2p/eepsite/docroot/help/lib/se.png
+usr/share/flags/countries/16x11/us.png usr/share/i2p/eepsite/docroot/help/lib/us.png
+
+
 # comment out if not building with libhttpclient-java and libhttpcore-java
 # 2 MB of dependencies vs. 20 KB of copied source
 # Requires 4.4 or higher.
diff --git a/debian-alt/trusty/rules b/debian-alt/trusty/rules
index 8d4b8effe2..a09d6c5493 100755
--- a/debian-alt/trusty/rules
+++ b/debian-alt/trusty/rules
@@ -143,6 +143,9 @@ endif
 	@mkdir -p $(CURDIR)/core/java/build
 	ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
 
+	@# debian: everywhere; ubuntu: trusty+
+	@/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties
+
 	@# 2 MB of dependencies vs. 20 KB of copied source
 	@# Requires 4.4 or higher.
 	@# Debian: Not in wheezy/jessie
diff --git a/debian-alt/xenial/control b/debian-alt/xenial/control
index decc47249b..cbe056908a 100644
--- a/debian-alt/xenial/control
+++ b/debian-alt/xenial/control
@@ -82,6 +82,7 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
  geoip-database,
  gettext-base,
  libgetopt-java,
+ famfamfam-flag-png
 Replaces: i2p ( << 0.8.6-5)
 Breaks: i2p (<< 0.8.6-5)
 Recommends: libjbigi-jni, ttf-dejavu
diff --git a/debian-alt/xenial/i2p-router.links b/debian-alt/xenial/i2p-router.links
index 9091e0e960..2a4843a85e 100644
--- a/debian-alt/xenial/i2p-router.links
+++ b/debian-alt/xenial/i2p-router.links
@@ -76,6 +76,23 @@ usr/share/java/libintl.jar usr/share/i2p/lib/libintl.jar
 usr/share/java/gnu-getopt.jar usr/share/i2p/lib/gnu-getopt.jar
 
 
+# comment out if not building with famfamfam-flag-png
+# ubuntu: trusty+
+# debian: everywhere
+usr/share/flags/countries/16x11 usr/share/i2p/docs/icons/flags
+usr/share/flags/countries/16x11/az.png usr/share/i2p/eepsite/docroot/help/lib/az.png
+usr/share/flags/countries/16x11/cn.png usr/share/i2p/eepsite/docroot/help/lib/cn.png
+usr/share/flags/countries/16x11/de.png usr/share/i2p/eepsite/docroot/help/lib/de.png
+usr/share/flags/countries/16x11/es.png usr/share/i2p/eepsite/docroot/help/lib/es.png
+usr/share/flags/countries/16x11/fr.png usr/share/i2p/eepsite/docroot/help/lib/fr.png
+usr/share/flags/countries/16x11/nl.png usr/share/i2p/eepsite/docroot/help/lib/nl.png
+usr/share/flags/countries/16x11/pl.png usr/share/i2p/eepsite/docroot/help/lib/pl.png
+usr/share/flags/countries/16x11/pt.png usr/share/i2p/eepsite/docroot/help/lib/pt.png
+usr/share/flags/countries/16x11/ru.png usr/share/i2p/eepsite/docroot/help/lib/ru.png
+usr/share/flags/countries/16x11/se.png usr/share/i2p/eepsite/docroot/help/lib/se.png
+usr/share/flags/countries/16x11/us.png usr/share/i2p/eepsite/docroot/help/lib/us.png
+
+
 # comment out if not building with libhttpclient-java and libhttpcore-java
 # 2 MB of dependencies vs. 20 KB of copied source
 # Requires 4.4 or higher.
diff --git a/debian-alt/xenial/rules b/debian-alt/xenial/rules
index 93bf10726b..29919c90d8 100755
--- a/debian-alt/xenial/rules
+++ b/debian-alt/xenial/rules
@@ -142,6 +142,9 @@ endif
 	@mkdir -p $(CURDIR)/core/java/build
 	ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
 
+	@# debian: everywhere; ubuntu: trusty+
+	@/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties
+
 	@# 2 MB of dependencies vs. 20 KB of copied source
 	@# Requires 4.4 or higher.
 	@# Debian: Not in wheezy/jessie
diff --git a/debian/control b/debian/control
index 6e78fa5629..f4fe87da9a 100644
--- a/debian/control
+++ b/debian/control
@@ -79,7 +79,8 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
  libgetopt-java,
  libjetty9-java,
  libtaglibs-standard-jstlel-java,
- libtomcat8-java
+ libtomcat8-java,
+ famfamfam-flag-png
 Replaces: i2p ( << 0.8.6-5)
 Breaks: i2p (<< 0.8.6-5)
 Recommends: libjbigi-jni, ttf-dejavu
diff --git a/debian/i2p-router.links b/debian/i2p-router.links
index fb535be9b5..07bdf1036d 100644
--- a/debian/i2p-router.links
+++ b/debian/i2p-router.links
@@ -82,6 +82,23 @@ usr/share/java/libintl.jar usr/share/i2p/lib/libintl.jar
 usr/share/java/gnu-getopt.jar usr/share/i2p/lib/gnu-getopt.jar
 
 
+# comment out if not building with famfamfam-flag-png
+# ubuntu: trusty+
+# debian: everywhere
+usr/share/flags/countries/16x11 usr/share/i2p/docs/icons/flags
+usr/share/flags/countries/16x11/az.png usr/share/i2p/eepsite/docroot/help/lib/az.png
+usr/share/flags/countries/16x11/cn.png usr/share/i2p/eepsite/docroot/help/lib/cn.png
+usr/share/flags/countries/16x11/de.png usr/share/i2p/eepsite/docroot/help/lib/de.png
+usr/share/flags/countries/16x11/es.png usr/share/i2p/eepsite/docroot/help/lib/es.png
+usr/share/flags/countries/16x11/fr.png usr/share/i2p/eepsite/docroot/help/lib/fr.png
+usr/share/flags/countries/16x11/nl.png usr/share/i2p/eepsite/docroot/help/lib/nl.png
+usr/share/flags/countries/16x11/pl.png usr/share/i2p/eepsite/docroot/help/lib/pl.png
+usr/share/flags/countries/16x11/pt.png usr/share/i2p/eepsite/docroot/help/lib/pt.png
+usr/share/flags/countries/16x11/ru.png usr/share/i2p/eepsite/docroot/help/lib/ru.png
+usr/share/flags/countries/16x11/se.png usr/share/i2p/eepsite/docroot/help/lib/se.png
+usr/share/flags/countries/16x11/us.png usr/share/i2p/eepsite/docroot/help/lib/us.png
+
+
 # comment out if not building with libhttpclient-java and libhttpcore-java
 # 2 MB of dependencies vs. 20 KB of copied source
 # Requires 4.4 or higher.
diff --git a/debian/rules b/debian/rules
index 85a8a8a611..0464c39dbe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -151,6 +151,9 @@ endif
 	@mkdir -p $(CURDIR)/core/java/build
 	ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
 
+	@# debian: everywhere; ubuntu: trusty+
+	@/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties
+
 	@# 2 MB of dependencies vs. 20 KB of copied source
 	@# Requires 4.4 or higher.
 	@# Debian: Not in wheezy/jessie
diff --git a/history.txt b/history.txt
index 9e4216ed5f..7f801fd4fc 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,13 @@
+2018-06-27 zzz
+  * Debian: Add dependency for famfamfam-flag-png (ticket #2270)
+
+2018-06-26 zzz
+  * Console: Move modified flags to new dir (ticket #2270)
+  * Console servlets: Move to new package (ticket #2265)
+  * NTCP pumper: Reduce false positives in failsafe code (ticket #2237)
+  * NTCP2: Initial checkins (proposal #111)
+  * Streaming: Enforce valid port in setters
+
 * 2018-06-26 0.9.35 released
 
 2018-06-23 zzz