diff --git a/build.xml b/build.xml
index afa372b0a..46d0db1f9 100644
--- a/build.xml
+++ b/build.xml
@@ -10,8 +10,7 @@
-
-
+
@@ -19,7 +18,7 @@
-
+
@@ -63,7 +62,7 @@
splitindex="true"
windowtitle="I2P" />
-
+
@@ -120,7 +119,7 @@
-
+
@@ -171,7 +170,8 @@
-
+
+
diff --git a/installer/resources/clients.config b/installer/resources/clients.config
new file mode 100644
index 000000000..80fa91e92
--- /dev/null
+++ b/installer/resources/clients.config
@@ -0,0 +1,15 @@
+# fire up the web console
+clientApp.0.args=7657 127.0.0.1 ./webapps/
+clientApp.0.main=net.i2p.router.web.RouterConsoleRunner
+clientApp.0.name=webConsole
+clientApp.0.onBoot=true
+
+# start up the SAM bridge so other client apps can connect
+clientApp.1.main=net.i2p.sam.SAMBridge
+clientApp.1.name=SAMBridge
+clientApp.1.args=sam.keys 127.0.0.1 7656 i2cp.tcp.host=localhost i2cp.tcp.port=7654
+
+# poke the i2ptunnels defined in i2ptunnel.config
+clientApp.2.main=net.i2p.i2ptunnel.TunnelControllerGroup
+clientApp.2.name=Tunnels
+clientApp.2.args=i2ptunnel.config
diff --git a/installer/resources/i2ptunnel.config b/installer/resources/i2ptunnel.config
new file mode 100644
index 000000000..279d64e3c
--- /dev/null
+++ b/installer/resources/i2ptunnel.config
@@ -0,0 +1,38 @@
+# eepproxy
+tunnel.0.name=eepProxy
+tunnel.0.description=HTTP proxy for browsing eepsites and the web
+tunnel.0.type=httpclient
+tunnel.0.interface=0.0.0.0
+tunnel.0.listenPort=4444
+tunnel.0.proxyList=squid.i2p,www1.squid.i2p
+tunnel.0.i2cpHost=localhost
+tunnel.0.i2cpPort=7654
+tunnel.0.option.tunnel.depthInbound=2
+tunnel.0.option.tunnel.numTunnels=2
+tunnel.0.startOnLoad=true
+
+# irc
+tunnel.1.name=ircProxy
+tunnel.1.description=IRC proxy to access the anonymous irc net
+tunnel.1.type=client
+tunnel.1.interface=0.0.0.0
+tunnel.1.listenPort=6668
+tunnel.1.targetDestination=irc.duck.i2p
+tunnel.1.i2cpHost=localhost
+tunnel.1.i2cpPort=7654
+tunnel.1.option.tunnel.depthInbound=2
+tunnel.1.option.tunnel.numTunnels=2
+tunnel.1.startOnLoad=true
+
+# local eepserver
+#tunnel.2.name=eepsite
+#tunnel.2.description=My eepsite
+#tunnel.2.type=server
+#tunnel.2.targetHost=localhost
+#tunnel.2.targetPort=8000
+#tunnel.2.privKeyFile=eepPriv.dat
+#tunnel.2.i2cpHost=localhost
+#tunnel.2.i2cpPort=7654
+#tunnel.2.option.tunnel.depthInbound=2
+#tunnel.2.option.tunnel.numTunnels=2
+#tunnel.2.startOnLoad=true
\ No newline at end of file