diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml
index d69ae128e8..e9975f7058 100644
--- a/apps/routerconsole/java/build.xml
+++ b/apps/routerconsole/java/build.xml
@@ -4,7 +4,7 @@
     <target name="build" depends="builddep, jar" />
     <target name="builddep">
         <ant dir="../../../router/java/" target="build" />
-        <!-- <ant dir="../../systray/java/" target="build" /> -->
+        <ant dir="../../systray/java/" target="build" />
 	<!-- router will build core -->
     </target>
     <target name="prepare">
@@ -21,8 +21,8 @@
                 <pathelement location="../../../core/java/build/i2p.jar" />
                 <pathelement location="../../../router/java/build/router.jar" />
                 <pathelement location="../../jetty/jettylib/org.mortbay.jetty-jdk1.2.jar" />
-                <!-- <pathelement location="../../systray/java/build/lib/systray.jar" /> -->
-                <!-- <pathelement location="../../systray/java/lib/systray4j.jar" /> -->
+                <pathelement location="../../systray/java/build/systray.jar" />
+                <pathelement location="../../systray/java/lib/systray4j.jar" />
                 <pathelement location="../../../installer/lib/wrapper/win32/wrapper.jar" /> <!-- we dont care if we're not on win32 -->
             </classpath>
         </javac>
@@ -88,7 +88,7 @@
         <mkdir dir="./build" />
         <mkdir dir="./build/javadoc" />
         <javadoc 
-            sourcepath="./src:../../../core/java/src:../../router/java/src" destdir="./build/javadoc" 
+            sourcepath="./src:../../../core/java/src:../../../router/java/src:../../systray/java/src" destdir="./build/javadoc" 
             packagenames="*" 
             use="true" 
             splitindex="true" 
@@ -100,11 +100,11 @@
     <target name="cleandep" depends="clean">
 	<!-- router will clean core -->
         <ant dir="../../../router/java/" target="cleandep" />
-        <!-- <ant dir="../../systray/java/" target="cleandep" /> -->
+        <ant dir="../../systray/java/" target="cleandep" />
     </target>
     <target name="distclean" depends="clean">
 	<!-- router will clean core -->
         <ant dir="../../../router/java/" target="distclean" />
-        <!-- <ant dir="../../systray/java/" target="distclean" /> -->
+        <ant dir="../../systray/java/" target="distclean" />
     </target>
 </project>
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java
index 8f86fa9c46..51f04d48c3 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java
@@ -3,7 +3,7 @@ package net.i2p.router.web;
 import net.i2p.router.ClientTunnelSettings;
 import net.i2p.router.Router;
 
-//import net.i2p.apps.systray.SysTray;
+import net.i2p.apps.systray.SysTray;
 import org.tanukisoftware.wrapper.WrapperManager;
 
 /**
@@ -31,12 +31,12 @@ public class ConfigServiceHandler extends FormHandler {
         } else if ("Dump threads".equals(_action)) {
             WrapperManager.requestThreadDump();
             addFormNotice("Threads dumped to logs/wrapper.log");
-        //} else if ("Show systray icon".equals(_action)) {
-        //    SysTray.instance().show();
-        //    addFormNotice("Systray icon enabled (if possible)");
-        //} else if ("Hide systray icon".equals(_action)) {
-        //    SysTray.instance().hide();
-        //    addFormNotice("Systray icon disabled");
+        } else if ("Show systray icon".equals(_action)) {
+            SysTray.getInstance().show();
+            addFormNotice("Systray icon enabled (if possible)");
+        } else if ("Hide systray icon".equals(_action)) {
+            SysTray.getInstance().hide();
+            addFormNotice("Systray icon disabled");
         } else {
             addFormNotice("Blah blah blah.  whatever.  I'm not going to " + _action);
         }
diff --git a/apps/systray/java/build.xml b/apps/systray/java/build.xml
index a7b4e2a030..70e6c78401 100644
--- a/apps/systray/java/build.xml
+++ b/apps/systray/java/build.xml
@@ -19,17 +19,11 @@
             classpath="./lib/systray4j.jar:../../../core/java/build/i2p.jar" />
     </target>
     <target name="jar" depends="compile">
-        <copy todir="./build/lib">
-            <fileset dir="./lib" includes="systray4j.dll systray4j.jar" />
-        </copy>
-        <copy todir="./build/icons">
-            <fileset dir="./resources/" />
-        </copy>
         <mkdir dir="./build/jar_temp" />
         <copy todir="./build/jar_temp">
             <fileset dir="./build/obj" includes="**/*.class" />
         </copy>
-        <jar destfile="./build/lib/systray.jar" basedir="./build/jar_temp" includes="**/*">
+        <jar destfile="./build/systray.jar" basedir="./build/jar_temp" includes="**/*">
             <manifest>
                 <attribute name="Main-Class" value="net.i2p.apps.systray.SysTray" />
                 <attribute name="Class-Path" value="systray4j.jar" />
diff --git a/apps/systray/java/i2psystray.bat b/apps/systray/java/i2psystray.bat
deleted file mode 100644
index ac41dd7381..0000000000
--- a/apps/systray/java/i2psystray.bat
+++ /dev/null
@@ -1 +0,0 @@
-java -cp systray4j.jar;. -Djava.library.path=. -jar systray.jar
diff --git a/apps/systray/java/i2psystray.sh b/apps/systray/java/i2psystray.sh
deleted file mode 100644
index da54e5913b..0000000000
--- a/apps/systray/java/i2psystray.sh
+++ /dev/null
@@ -1 +0,0 @@
-java -cp systray4j.jar:. -Djava.library.path=. -jar systray.jar
diff --git a/build.xml b/build.xml
index d68cbd7bda..6ac35b5109 100644
--- a/build.xml
+++ b/build.xml
@@ -13,7 +13,7 @@
         <echo message="  buildWEB:  build the router console web application" />
         <echo message="  pkg:       make the tarball and installer jar (depends upon preppkg)" />
         <echo message="  pkgclean:  delete the ./pkg-temp/ dir, tarball and installer jar" />
-        <echo message="  preppkg:   gather built files for tarball and installer (depends upon prepWEB)" />
+        <echo message="  preppkg:   gather built files for tarball and installer" />
         <echo message="  tarball:   tar the built files and compress with bz2 (depends upon preppkg)" />
         <echo message="  installer: build the GUI installer (depends upon preppkg)" />
     </target>
@@ -75,6 +75,7 @@
         <ant dir="apps/sam/java/" target="jar" />
         <ant dir="apps/heartbeat/java/" target="jar" />
         <ant dir="apps/netmonitor/java/" target="jar" />
+        <ant dir="apps/systray/java/" target="jar" />
         <ant dir="apps/routerconsole/java/" target="jar" />
         <ant dir="installer/java/" target="jar" />
     </target>
@@ -88,6 +89,7 @@
         <copy file="apps/sam/java/build/sam.jar" todir="build/" />
         <copy file="apps/heartbeat/java/build/heartbeat.jar" todir="build/" />
         <copy file="apps/netmonitor/java/build/netmonitor.jar" todir="build/" />
+        <copy file="apps/systray/java/build/systray.jar" todir="build/" />
         <copy file="installer/java/build/install.jar" todir="build/" />
         <copy file="installer/java/build/guiinstall.jar" todir="build/" />
         <copy file="installer/java/build/fetchseeds.jar" todir="build/" />
@@ -97,8 +99,8 @@
         <mkdir dir="./build" />
         <mkdir dir="./build/javadoc" />
         <javadoc 
-            sourcepath="core/java/src:core/java/test:router/java/src:router/java/test:apps/ministreaming/java/src:apps/i2ptunnel/java/src:apps/httptunnel/java/src:apps/routerconsole/java/src" 
-            classpath="apps/jetty/jettylib/org.mortbay.jetty.jar:installer/lib/wrapper/win32/wrapper.jar" 
+            sourcepath="core/java/src:core/java/test:router/java/src:router/java/test:apps/ministreaming/java/src:apps/i2ptunnel/java/src:apps/httptunnel/java/src:apps/systray/java/src:apps/routerconsole/java/src" 
+            classpath="apps/jetty/jettylib/org.mortbay.jetty.jar:apps/systray/java/lib/systray4j.jar:installer/lib/wrapper/win32/wrapper.jar" 
             destdir="./build/javadoc" 
             packagenames="*" 
             use="true" 
@@ -117,6 +119,7 @@
         <ant dir="apps/heartbeat/java/" target="distclean" />
         <ant dir="apps/netmonitor/java/" target="distclean" />
         <ant dir="apps/routerconsole/java/" target="distclean" />
+        <ant dir="apps/systray/java/" target="distclean" />
         <ant dir="installer/java/" target="distclean" />
         <delete>
             <fileset dir="." includes="**/*.class" />
@@ -197,6 +200,7 @@
         <copy file="build/jasper-compiler.jar" todir="pkg-temp/lib/" />
         <copy file="build/jasper-runtime.jar" todir="pkg-temp/lib/" />
         <copy file="build/javax.servlet.jar" todir="pkg-temp/lib/" />
+        <copy file="build/jbigi.jar" todir="pkg-temp/lib" />
         <copy file="build/jnet.jar" todir="pkg-temp/lib/" />
         <copy file="build/mstreaming.jar" todir="pkg-temp/lib/" />
         <copy file="build/netmonitor.jar" todir="pkg-temp/lib/" />
@@ -205,9 +209,13 @@
         <copy file="build/router.jar" todir="pkg-temp/lib/" />
         <copy file="build/routerconsole.jar" todir="pkg-temp/lib/" />
         <copy file="build/sam.jar" todir="pkg-temp/lib/" />
+        <copy file="build/systray.jar" todir="pkg-temp/lib" />
+        <copy file="apps/systray/java/lib/systray4j.jar" todir="pkg-temp/lib" />
+        <copy file="apps/systray/java/lib/systray4j.dll" todir="pkg-temp/lib" />
+        <copy file="apps/systray/java/resources/iggy.ico" todir="pkg-temp/icons" />
+        <copy file="apps/systray/java/resources/iggy.xpm" todir="pkg-temp/icons" />
         <copy file="build/xercesImpl.jar" todir="pkg-temp/lib/" />
         <copy file="build/xml-apis.jar" todir="pkg-temp/lib/" />
-        <copy file="build/jbigi.jar" todir="pkg-temp/lib" />
         <copy file="build/i2ptunnel.war" todir="pkg-temp/webapps/" />
         <copy file="build/routerconsole.war" todir="pkg-temp/webapps/" />
         <copy file="hosts.txt" todir="pkg-temp/" />