diff --git a/LICENSE.txt b/LICENSE.txt
index 295da33aa..7a6775bc7 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -186,6 +186,17 @@ Applications:
    By welterde.
    See licenses/LICENSE-GPLv2.txt
 
+   Imagegen:
+     Identicon:
+       Copyright (c) 2007-2014 Don Park <donpark@docuverse.com>
+       See licenses/LICENSE-Identicon.txt
+     RandomArt:
+       Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
+       Copyright (c) 2008 Alexander von Gernler.  All rights reserved.
+       See licenses/LICENSE-BSD.txt
+     Zxing:
+       See licenses/LICENSE-Apache2.0.txt
+
    Jetty 8.1.17.v20150415:
    See licenses/ABOUT-Jetty.html
    See licenses/NOTICE-Jetty.html
diff --git a/apps/imagegen/build.xml b/apps/imagegen/build.xml
new file mode 100644
index 000000000..2dbd7a4d1
--- /dev/null
+++ b/apps/imagegen/build.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project basedir="." default="all" name="identicon">
+    <target name="all" depends="clean, build" />
+
+    <target name="build">
+        <ant dir="identicon" target="build" />
+        <ant dir="zxing" target="build" />
+        <ant dir="imagegen" target="build" />
+    </target>
+
+    <target name="compile">
+        <ant dir="identicon" target="compile" />
+        <ant dir="zxing" target="compile" />
+        <ant dir="imagegen" target="compile" />
+    </target>
+
+    <target name="compileTest">
+        <ant dir="identicon" target="compileTest" />
+        <ant dir="zxing" target="compileTest" />
+    </target>
+
+    <target name="jarTest">
+        <ant dir="identicon" target="jarTest" />
+        <ant dir="zxing" target="jarTest" />
+    </target>
+
+    <!-- not used, war bundles the classes -->
+    <target name="jar">
+        <ant dir="identicon" target="jar" />
+        <ant dir="zxing" target="jar" />
+    </target>
+
+    <target name="war" depends="compile">
+        <ant dir="imagegen" target="war" />
+    </target>
+
+    <target name="javadoc">
+        <ant dir="identicon" target="javadoc" />
+        <ant dir="zxing" target="javadoc" />
+        <ant dir="imagegen" target="javadoc" />
+    </target>
+
+    <target name="clean">
+        <ant dir="identicon" target="clean" />
+        <ant dir="zxing" target="clean" />
+        <ant dir="imagegen" target="clean" />
+    </target>
+
+    <target name="distclean">
+        <ant dir="identicon" target="distclean" />
+        <ant dir="zxing" target="distclean" />
+        <ant dir="imagegen" target="distclean" />
+    </target>
+</project>
diff --git a/apps/imagegen/zxing/build.xml b/apps/imagegen/zxing/build.xml
index 3342776dc..4ddb3bcf3 100644
--- a/apps/imagegen/zxing/build.xml
+++ b/apps/imagegen/zxing/build.xml
@@ -17,7 +17,7 @@
     </target>
 
     <!-- only used if not set by a higher build.xml -->
-    <property name="javac.compilerargs" value="" />
+    <property name="javac.compilerargs7" value="" />
 
     <target name="compile" depends="depend">
         <mkdir dir="./build" />
@@ -25,12 +25,12 @@
         <javac srcdir="./core/src/main/java" debug="true" deprecation="on" source="1.7" target="1.7"
                includeAntRuntime="false"
                destdir="./build/obj" >
-            <compilerarg line="${javac.compilerargs}" />
+            <compilerarg line="${javac.compilerargs7}" />
         </javac>
         <javac srcdir="./javase/src/main/java" debug="true" deprecation="on" source="1.7" target="1.7"
                includeAntRuntime="false"
                destdir="./build/obj" classpath="./build/obj" >
-            <compilerarg line="${javac.compilerargs}" />
+            <compilerarg line="${javac.compilerargs7}" />
         </javac>
     </target>
 
@@ -43,7 +43,7 @@
             includeAntRuntime="false"
             destdir="./buildTest/obj"
             classpath="./build/zxing.jar" >
-            <compilerarg line="${javac.compilerargs}" />
+            <compilerarg line="${javac.compilerargs7}" />
         </javac>
     </target>
 
diff --git a/build.xml b/build.xml
index 40b1ed2fa..65bda9ed8 100644
--- a/build.xml
+++ b/build.xml
@@ -284,11 +284,16 @@
         <copy file="apps/susimail/susimail.war" todir="build/" />
     </target>
 
-    <target name="buildSusiDNS" depends="buildCore, buildJetty" >
+    <target name="buildSusiDNS" depends="buildCore, buildJetty, buildImagegen" >
         <ant dir="apps/susidns/src" target="all" />
         <copy file="apps/susidns/src/susidns.war" todir="build/" />
     </target>
 
+    <target name="buildImagegen" depends="buildCore, buildJetty" >
+        <ant dir="apps/imagegen" target="all" />
+        <copy file="apps/imagegen/imagegen/build/imagegen.war" todir="build/" />
+    </target>
+
     <target name="buildI2PSnark" depends="buildStreaming, buildJetty" >
         <ant dir="apps/i2psnark/java/" target="war" />
         <copy file="apps/i2psnark/i2psnark.war" todir="build/" />
@@ -702,6 +707,7 @@
             <group title="Desktopgui Application" packages="net.i2p.desktopgui:net.i2p.desktopgui.*" />
             <group title="I2PSnark Application" packages="org.klomp.snark:org.klomp.snark.*" />
             <group title="I2PTunnel Application" packages="net.i2p.i2ptunnel:net.i2p.i2ptunnel.*" />
+            <group title="Imagegen Application" packages="com.docuverse.identicon:com.google.zxing:com.google.zxing.*:net.i2p.imagegen" />
             <group title="Installer Utilities" packages="net.i2p.installer" />
             <group title="Jetty Utilities" packages="net.i2p.jetty:net.i2p.servlet:net.i2p.servlet.*:org.mortbay.servlet:org.mortbay.util" />
             <group title="SAM Bridge" packages="net.i2p.sam" />
@@ -727,6 +733,10 @@
                 <pathelement location="apps/susidns/src/java/src" />
                 <pathelement location="apps/susimail/src/src" />
                 <pathelement location="apps/jetty/java/src" />
+                <pathelement location="apps/imagegen/imagegen/webapp/src/main/java" />
+                <pathelement location="apps/imagegen/identicon/core/src/main/java" />
+                <pathelement location="apps/imagegen/zxing/core/src/main/java" />
+                <pathelement location="apps/imagegen/zxing/javase/src/main/java" />
                 <pathelement location="installer/java/src" />
             </sourcepath>
             <classpath>
@@ -1150,6 +1160,7 @@
         <copy file="build/addressbook.war" todir="pkg-temp/webapps/" />
         <copy file="build/susimail.war" todir="pkg-temp/webapps/" />
         <copy file="build/susidns.war" todir="pkg-temp/webapps/" />
+        <copy file="build/imagegen.war" todir="pkg-temp/webapps/" />
         <copy file="apps/susidns/src/WEB-INF/lib/jstl.jar" todir="pkg-temp/lib/" />
         <copy file="apps/susidns/src/WEB-INF/lib/standard.jar" todir="pkg-temp/lib/" />
         <copy file="build/i2psnark.war" todir="pkg-temp/webapps/" />
@@ -1201,6 +1212,7 @@
         <copy file="installer/lib/launch4j/lib/JGoodies.Forms.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-JGoodies-Forms.txt" />
         <copy file="installer/lib/launch4j/lib/JGoodies.Looks.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-JGoodies-Looks.txt" />
         <copy file="installer/lib/launch4j/lib/XStream.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-XStream.txt" />
+        <copy file="apps/imagegen/identicon/README.md" tofile="pkg-temp/licenses/LICENSE-Identicon.txt" />
     </target>
 
     <target name="prepthemeupdates">
@@ -1403,6 +1415,7 @@
        -->
         <copy file="build/susimail.war" todir="pkg-temp/webapps/" />
         <copy file="build/susidns.war" todir="pkg-temp/webapps/" />
+        <copy file="build/imagegen.war" todir="pkg-temp/webapps/" />
         <!-- as of 0.7.12; someday, we can remove these from the updater -->
         <copy file="apps/susidns/src/WEB-INF/lib/jstl.jar" todir="pkg-temp/lib/" />
         <copy file="apps/susidns/src/WEB-INF/lib/standard.jar" todir="pkg-temp/lib/" />
@@ -1777,6 +1790,7 @@
             <arg value="build/i2psnark.war"/>
             <arg value="build/i2ptunnel.jar"/>
             <arg value="build/i2ptunnel.war"/>
+            <arg value="build/imagegen.war"/>
             <arg value="build/jetty-i2p.jar"/>
             <arg value="build/mstreaming.jar"/>
             <arg value="build/router.jar/"/>