diff --git a/installer/java/src/install.config b/installer/java/src/install.config
index b7786ba29..99b0acb55 100644
--- a/installer/java/src/install.config
+++ b/installer/java/src/install.config
@@ -88,7 +88,7 @@ qs.0045.question=<none>
 qs.0050.question=End of configuration.
 
 
-libs.count=13
+libs.count=14
 libs.0001.name=i2p.jar
     libs.0001.islib=true
 libs.0002.name=i2ptunnel.jar
@@ -114,4 +114,6 @@ libs.0011.name=netmonitor.jar
 libs.0012.name=harvester.config
     libs.0012.islib=false
 libs.0013.name=heartbeat.config
-    libs.0013.islib=false
\ No newline at end of file
+    libs.0013.islib=false
+libs.0014.name=timestamper.jar
+    libs.0014.islib=true
\ No newline at end of file
diff --git a/installer/java/src/router.config.template b/installer/java/src/router.config.template
index 7b39b5d89..176f8872f 100644
--- a/installer/java/src/router.config.template
+++ b/installer/java/src/router.config.template
@@ -156,26 +156,31 @@ router.maxWaitingJobs=40
 # applications it is up and running, all within the router's JVM.  Uncomment the
 # ones you want (revising the numbers and ports accordingly)
 
+clientApp=0.main=net.i2p.time.Timestamper
+clientApp.0.name=Timestamper
+clientApp.0.onBoot=true
+clientApp.0.args=http://localhost:7655/setTime?k=v ntp1.sth.netnod.se ntp2.sth.netnod.se
+
 # Network monitor (harvests data from the network database and stores it under 
 # monitorData/, and with the netviewer GUI you can browse through its results)
-clientApp.0.main=net.i2p.netmonitor.NetMonitor
-clientApp.0.name=NetMonitor
-clientApp.0.args=
+clientApp.1.main=net.i2p.netmonitor.NetMonitor
+clientApp.1.name=NetMonitor
+clientApp.1.args=
 
 # SAM bridge (a simplified socket based protocol for using I2P - listens on port 7656.  see
 # the specs at http://www.i2p.net/node/view/144 for more info)
-clientApp.1.main=net.i2p.sam.SAMBridge
-clientApp.1.name=SAMBridge
-clientApp.1.args=0.0.0.0 7656 i2cp.tcp.host=localhost i2cp.tcp.port=##_router_i2cp_port##
+clientApp.2.main=net.i2p.sam.SAMBridge
+clientApp.2.name=SAMBridge
+clientApp.2.args=0.0.0.0 7656 i2cp.tcp.host=localhost i2cp.tcp.port=##_router_i2cp_port##
 
 # EepProxy (HTTP proxy that lets you browse both eepsites and the normal web via squid.i2p)
-clientApp.2.main=net.i2p.i2ptunnel.I2PTunnel
-clientApp.2.name=EepProxy
-clientApp.2.args=-nogui -e "config localhost ##_router_i2cp_port##" -e "httpclient 4444"
+clientApp.3.main=net.i2p.i2ptunnel.I2PTunnel
+clientApp.3.name=EepProxy
+clientApp.3.args=-nogui -e "config localhost ##_router_i2cp_port##" -e "httpclient 4444"
 
 # Heartbeat engine (uber-simple ping/pong system, configured in heartbeat.config.  By itself
 # it just writes out stat data where its told to, but there's a seperate HeartbeatMonitor 
 # GUI to let you visualize things)
-#clientApp.3.main=net.i2p.heartbeat.Heartbeat
-#clientApp.3.name=Heartbeat
-#clientApp.3.args=heartbeat.config
\ No newline at end of file
+#clientApp.4.main=net.i2p.heartbeat.Heartbeat
+#clientApp.4.name=Heartbeat
+#clientApp.4.args=heartbeat.config
\ No newline at end of file
diff --git a/installer/java/src/startRouter.bat.template b/installer/java/src/startRouter.bat.template
index ed83cb499..e434deb0e 100644
--- a/installer/java/src/startRouter.bat.template
+++ b/installer/java/src/startRouter.bat.template
@@ -5,5 +5,5 @@ cd ##_scripts_installdir##
 REM the -XX args are workarounds for bugs in java 1.4.2's garbage collector
 REM replace java with javaw if you don't want a window to pop up
 
-javaw -cp lib\i2p.jar;lib\router.jar;lib\mstreaming.jar;lib\heartbeat.jar;lib\i2ptunnel.jar;lib\netmonitor.jar;lib\sam.jar -Djava.library.path=. -DloggerFilenameOverride=logs\log-router-#.txt -XX:NewSize=4M -XX:MaxNewSize=8M -XX:PermSize=8M -XX:MaxPermSize=32M net.i2p.router.Router
+javaw -cp lib\i2p.jar;lib\router.jar;lib\mstreaming.jar;lib\heartbeat.jar;lib\i2ptunnel.jar;lib\netmonitor.jar;lib\sam.jar;lib\timestamper.jar -Djava.library.path=. -DloggerFilenameOverride=logs\log-router-#.txt -XX:NewSize=4M -XX:MaxNewSize=8M -XX:PermSize=8M -XX:MaxPermSize=32M net.i2p.router.Router
 echo Router started up, please see http://localhost:7655/
diff --git a/installer/java/src/startRouter.sh.template b/installer/java/src/startRouter.sh.template
index ecf6d02a1..578577258 100644
--- a/installer/java/src/startRouter.sh.template
+++ b/installer/java/src/startRouter.sh.template
@@ -2,7 +2,7 @@
 cd ##_scripts_installdir##
 export LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH
 # the -XX args are workarounds for bugs in java 1.4.2's garbage collector
-nohup nice java -cp lib/i2p.jar:lib/router.jar:lib/mstreaming.jar:lib/heartbeat.jar:lib/i2ptunnel.jar:lib/netmonitor.jar:lib/sam.jar -Djava.library.path=. -DloggerFilenameOverride=logs/log-router-#.txt -XX:NewSize=4M -XX:MaxNewSize=8M -XX:PermSize=8M -XX:MaxPermSize=32M net.i2p.router.Router --quiet > /dev/null &
+nohup nice java -cp lib/i2p.jar:lib/router.jar:lib/mstreaming.jar:lib/heartbeat.jar:lib/i2ptunnel.jar:lib/netmonitor.jar:lib/sam.jar:lib/timestamper.jar -Djava.library.path=. -DloggerFilenameOverride=logs/log-router-#.txt -XX:NewSize=4M -XX:MaxNewSize=8M -XX:PermSize=8M -XX:MaxPermSize=32M net.i2p.router.Router --quiet > /dev/null &
 # Save the pid just in case we ever want to stop the router
 echo $! > router.pid
 echo I2P Router started