diff --git a/apps/addressbook/build.xml b/apps/addressbook/build.xml
index 30750a231f..2fe77475cb 100644
--- a/apps/addressbook/build.xml
+++ b/apps/addressbook/build.xml
@@ -51,6 +51,8 @@
         <!-- unused for now, as we oddly ship addressbook as a .war -->
 	<target name="jar" depends="compile, changes">
 		<jar basedir="${build}" destfile="${dist}/${jar}">
+		<!-- set if unset -->
+		<property name="workspace.changes" value="" />
 			<manifest>
 				<attribute name="Main-Class" value="addressbook.Daemon"/>
 		                <attribute name="Build-Date" value="${build.timestamp}" />
@@ -67,6 +69,8 @@
 		<copy todir="${dist}/tmp/WEB-INF/classes">
 			<fileset dir="${build}"/>
 		</copy>
+		<!-- set if unset -->
+		<property name="workspace.changes.tr" value="" />
 		<war basedir="${dist}/tmp" webxml="web.xml" destfile="${dist}/${war}">
 			<manifest>
 		                <attribute name="Build-Date" value="${build.timestamp}" />
@@ -81,9 +85,17 @@
 	        <uptodate property="war.uptodate" targetfile="${dist}/${war}">
 		            <srcfiles dir= "." includes="${build}/**/*.class, web.xml"/>
 	        </uptodate>
+                <condition property="shouldListChanges" >
+                    <and>
+                        <not>
+                            <isset property="war.uptodate" />
+                        </not>
+                        <isset property="mtn.available" />
+                    </and>
+                </condition>
 	</target>
 
-	<target name="changes">
+	<target name="changes" depends="warUpToDate" if="shouldListChanges" >
 	        <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
 	            <arg value="list" />
 	            <arg value="changed" />
diff --git a/apps/desktopgui/build.xml b/apps/desktopgui/build.xml
index 5a01671cc2..b85975d8bd 100644
--- a/apps/desktopgui/build.xml
+++ b/apps/desktopgui/build.xml
@@ -38,7 +38,7 @@
         </copy>
 	</target>
 
-	<target name="jar" depends="compile">
+	<target name="bundle" >
         <exec executable="sh" osfamily="unix" failifexecutionfails="true" >
             <arg value="./bundle-messages.sh" />
         </exec>
@@ -49,6 +49,9 @@
         <exec executable="sh" osfamily="windows" failifexecutionfails="false" >
             <arg value="./bundle-messages.sh" />
         </exec>
+	</target>
+
+        <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
         <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
             <arg value="list" />
             <arg value="changed" />
@@ -60,6 +63,11 @@
             <arg value="[:space:]" />
             <arg value="," />
         </exec>
+	</target>
+
+	<target name="jar" depends="compile, bundle, listChangedFiles" unless="jar.uptodate" >
+		<!-- set if unset -->
+		<property name="workspace.changes.tr" value="" />
 		<jar basedir="${build}" destfile="${dist}/${jar}">
 			<manifest>
 				<attribute name="Main-Class" value="net.i2p.desktopgui.Main"/>
@@ -70,6 +78,20 @@
 		</jar>
 	</target>
 
+    <target name="jarUpToDate">
+        <uptodate property="jar.uptodate" targetfile="${dist}/${jar}" >
+            <srcfiles dir= "." includes="build/**/*.class" />
+        </uptodate>
+        <condition property="shouldListChanges" >
+            <and>
+                <not>
+                    <isset property="jar.uptodate" />
+                </not>
+                <isset property="mtn.available" />
+            </and>
+        </condition>
+    </target>
+
     <target name="javadoc">
         <mkdir dir="${build}" />
         <mkdir dir="${build}/${javadoc}" />
diff --git a/apps/i2psnark/java/build.xml b/apps/i2psnark/java/build.xml
index e500dcc614..f5906e3bf8 100644
--- a/apps/i2psnark/java/build.xml
+++ b/apps/i2psnark/java/build.xml
@@ -36,7 +36,7 @@
         </javac>
     </target>
 
-    <target name="jar" depends="builddep, compile, jarUpToDate" unless="jar.uptodate" >
+    <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
         <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
             <arg value="list" />
             <arg value="changed" />
@@ -48,6 +48,11 @@
             <arg value="[:space:]" />
             <arg value="," />
         </exec>
+    </target>
+
+    <target name="jar" depends="builddep, compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
+        <!-- set if unset -->
+        <property name="workspace.changes.tr" value="" />
         <jar destfile="./build/i2psnark.jar" basedir="./build/obj" includes="**/*.class" excludes="**/I2PSnarkServlet*.class **/messages_*.class">
             <manifest>
                 <attribute name="Main-Class" value="org.klomp.snark.Snark" />
@@ -63,6 +68,17 @@
         <uptodate property="jar.uptodate" targetfile="build/i2psnark.jar" >
             <srcfiles dir= "build/obj" includes="**/*.class" excludes="**/I2PSnarkServlet*.class **/messages_*.class" />
         </uptodate>
+        <condition property="shouldListChanges" >
+            <and>
+                <not>
+                    <isset property="jar.uptodate" />
+                </not>
+                <not>
+                    <isset property="wjar.uptodate" />
+                </not>
+                <isset property="mtn.available" />
+            </and>
+        </condition>
     </target>    
 
     <!-- Ideally we would include
@@ -72,7 +88,9 @@
       -  So we must continue to duplicate everything in the war.
           <classes dir="./build/obj" includes="**/I2PSnarkServlet*.class" />
      -->
-    <target name="war" depends="jar, bundle, warUpToDate" unless="war.uptodate" > 
+    <target name="war" depends="jar, bundle, warUpToDate, listChangedFiles" unless="war.uptodate" > 
+        <!-- set if unset -->
+        <property name="workspace.changes.tr" value="" />
         <war destfile="../i2psnark.war" webxml="../web.xml" basedir="../" includes="_icons/*" >
           <!-- include only the web stuff, as of 0.7.12 the router will add i2psnark.jar to the classpath for the war -->
           <classes dir="./build/obj" includes="**/web/*.class" />
diff --git a/apps/i2ptunnel/java/build.xml b/apps/i2ptunnel/java/build.xml
index 56ca6f30b0..b7fe4e9083 100644
--- a/apps/i2ptunnel/java/build.xml
+++ b/apps/i2ptunnel/java/build.xml
@@ -34,10 +34,7 @@
         </javac>
     </target>
 
-    <!-- TODO: Move the web classes from the jar to the war - they are not part of the API
-      -  This will require sponge to rewrite some seedless stuff that uses it.
-     -->
-    <target name="jar" depends="builddep, compile, jarUpToDate" unless="jar.uptodate" >
+    <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
         <exec executable="mtn" outputproperty="workspace.changes.j" errorproperty="mtn.error2" failifexecutionfails="false" >
             <arg value="list" />
             <arg value="changed" />
@@ -49,6 +46,15 @@
             <arg value="[:space:]" />
             <arg value="," />
         </exec>
+    </target>
+
+
+    <!-- TODO: Move the web classes from the jar to the war - they are not part of the API
+      -  This will require sponge to rewrite some seedless stuff that uses it.
+     -->
+    <target name="jar" depends="builddep, compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
+        <!-- set if unset -->
+        <property name="workspace.changes.j.tr" value="" />
         <jar destfile="./build/i2ptunnel.jar" basedir="./build/obj" includes="**/*.class">
             <manifest>
                 <attribute name="Main-Class" value="net.i2p.i2ptunnel.I2PTunnel" />
@@ -64,6 +70,14 @@
         <uptodate property="jar.uptodate" targetfile="build/i2ptunnel.jar" >
             <srcfiles dir= "build/obj" includes="**/*.class" />
         </uptodate>
+        <condition property="shouldListChanges" >
+            <and>
+                <not>
+                    <isset property="jar.uptodate" />
+                </not>
+                <isset property="mtn.available" />
+            </and>
+        </condition>
     </target>
 
     <target name="bundle" depends="compile, precompilejsp">
@@ -97,7 +111,7 @@
         </exec>
     </target>
 
-    <target name="war" depends="precompilejsp, bundle, warUpToDate" unless="war.uptodate" > 
+    <target name="listChangedFiles2" depends="warUpToDate" if="shouldListChanges2" >
         <exec executable="mtn" outputproperty="workspace.changes.w" errorproperty="mtn.error2" failifexecutionfails="false" >
             <arg value="list" />
             <arg value="changed" />
@@ -109,6 +123,11 @@
             <arg value="[:space:]" />
             <arg value="," />
         </exec>
+    </target>
+
+    <target name="war" depends="precompilejsp, bundle, warUpToDate, listChangedFiles2" unless="war.uptodate" > 
+        <!-- set if unset -->
+        <property name="workspace.changes.w.tr" value="" />
         <war destfile="build/i2ptunnel.war" webxml="../jsp/web-out.xml"
              basedir="../jsp/" excludes="web.xml, web-fragment.xml, web-out.xml, **/*.java, *.jsp">
             <manifest>
@@ -123,6 +142,14 @@
         <uptodate property="war.uptodate" targetfile="build/i2ptunnel.war" >
             <srcfiles dir= "../jsp" excludes="web.xml, web-fragment.xml, **/*.java, *.jsp" />
         </uptodate>
+        <condition property="shouldListChanges2" >
+            <and>
+                <not>
+                    <isset property="war.uptodate" />
+                </not>
+                <isset property="mtn.available" />
+            </and>
+        </condition>
     </target>
 
     <target name="precompilejsp" depends="jar" unless="precompilejsp.uptodate">
diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml
index 73ac7a1d16..e686e364a7 100644
--- a/apps/jetty/build.xml
+++ b/apps/jetty/build.xml
@@ -98,7 +98,7 @@
         </javac>
     </target>
 
-    <target name="jar" depends="compile, jarUpToDate" unless="jar.uptodate" >
+    <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
         <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
             <arg value="list" />
             <arg value="changed" />
@@ -110,6 +110,11 @@
             <arg value="[:space:]" />
             <arg value="," />
         </exec>
+    </target>
+
+    <target name="jar" depends="compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
+        <!-- set if unset -->
+        <property name="workspace.changes.tr" value="" />
         <jar destfile="./jettylib/org.mortbay.jetty.jar" basedir="./build/obj" includes="**/*.class" update="true" >
             <manifest>
                 <attribute name="Build-Date" value="${build.timestamp}" />
@@ -123,6 +128,14 @@
         <uptodate property="jar.uptodate" targetfile="jettylib/org.mortbay.jetty.jar" >
             <srcfiles dir= "build/obj" includes="**/*.class" />
         </uptodate>
+        <condition property="shouldListChanges" >
+            <and>
+                <not>
+                    <isset property="jar.uptodate" />
+                </not>
+                <isset property="mtn.available" />
+            </and>
+        </condition>
     </target>    
 
     <target name="clean" >
diff --git a/apps/ministreaming/java/build.xml b/apps/ministreaming/java/build.xml
index 8fcd2d517c..8904bafb3b 100644
--- a/apps/ministreaming/java/build.xml
+++ b/apps/ministreaming/java/build.xml
@@ -31,7 +31,7 @@
         </javac>
     </target>
 
-    <target name="jar" depends="compile, jarUpToDate" unless="jar.uptodate" >
+    <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
         <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
             <arg value="list" />
             <arg value="changed" />
@@ -43,6 +43,11 @@
             <arg value="[:space:]" />
             <arg value="," />
         </exec>
+    </target>
+
+    <target name="jar" depends="compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
+        <!-- set if unset -->
+        <property name="workspace.changes.tr" value="" />
         <jar destfile="./build/mstreaming.jar" basedir="./build/obj" includes="**/*.class" >
             <manifest>
                 <attribute name="Build-Date" value="${build.timestamp}" />
@@ -56,6 +61,14 @@
         <uptodate property="jar.uptodate" targetfile="build/mstreaming.jar" >
             <srcfiles dir= "." includes="build/obj/**/*.class" />
         </uptodate>
+        <condition property="shouldListChanges" >
+            <and>
+                <not>
+                    <isset property="jar.uptodate" />
+                </not>
+                <isset property="mtn.available" />
+            </and>
+        </condition>
     </target>
 
     <target name="javadoc">
diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml
index e517d77e1b..7de6836ccd 100644
--- a/apps/routerconsole/java/build.xml
+++ b/apps/routerconsole/java/build.xml
@@ -67,7 +67,7 @@
     <target name="jar" depends="jar1, war, bundle" />
 
     <!-- the jar without the latest message classes from the jsps -->
-    <target name="jar1" depends="compile, jarUpToDate" unless="jar.uptodate" >
+    <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
         <exec executable="mtn" outputproperty="workspace.changes.j" errorproperty="mtn.error2" failifexecutionfails="false" >
             <arg value="list" />
             <arg value="changed" />
@@ -80,6 +80,11 @@
             <arg value="[:space:]" />
             <arg value="," />
         </exec>
+    </target>
+
+    <target name="jar1" depends="compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
+        <!-- set if unset -->
+        <property name="workspace.changes.j.tr" value="" />
         <jar destfile="./build/routerconsole.jar" basedir="./build/obj" includes="**/*.class">
             <manifest>
                 <!-- top level installer will rename to jrobin.jar -->
@@ -115,6 +120,14 @@
         <uptodate property="jar.uptodate" targetfile="build/routerconsole.jar" >
             <srcfiles dir= "build/obj" includes="**/*.class" />
         </uptodate>
+        <condition property="shouldListChanges" >
+            <and>
+                <not>
+                    <isset property="jar.uptodate" />
+                </not>
+                <isset property="mtn.available" />
+            </and>
+        </condition>
     </target>
 
     <target name="poupdate" depends="precompilejsp">
@@ -134,8 +147,7 @@
         </exec>
     </target>
 
-    <!-- does NOT update the message classes, as those go in the jar -->
-    <target name="war" depends="precompilejsp, warUpToDate" unless="war.uptodate" >
+    <target name="listChangedFiles2" depends="warUpToDate" if="shouldListChanges2" >
         <exec executable="mtn" outputproperty="workspace.changes.w" errorproperty="mtn.error2" failifexecutionfails="false" >
             <arg value="list" />
             <arg value="changed" />
@@ -147,6 +159,12 @@
             <arg value="[:space:]" />
             <arg value="," />
         </exec>
+    </target>
+
+    <!-- does NOT update the message classes, as those go in the jar -->
+    <target name="war" depends="precompilejsp, warUpToDate, listChangedFiles2" unless="war.uptodate" >
+        <!-- set if unset -->
+        <property name="workspace.changes.w.tr" value="" />
         <!-- Don't include the css in the war, the main build.xml will copy it to docs/themes/console/ -->
         <war destfile="build/routerconsole.war" webxml="../jsp/web-out.xml"
              basedir="../jsp/" excludes="web.xml, *.css, **/*.java, *.jsp, *.jsi, web-fragment.xml, web-out.xml">
@@ -162,6 +180,14 @@
         <uptodate property="war.uptodate" targetfile="build/routerconsole.war" >
             <srcfiles dir= "../jsp" excludes="web.xml, web-fragment.xml, *.css, **/*.java, *.jsp, *.jsi" />
         </uptodate>
+        <condition property="shouldListChanges" >
+            <and>
+                <not>
+                    <isset property="jar.uptodate" />
+                </not>
+                <isset property="mtn.available" />
+            </and>
+        </condition>
     </target>
 
     <target name="precompilejsp" depends="jar1" unless="precompilejsp.uptodate">
diff --git a/apps/sam/java/build.xml b/apps/sam/java/build.xml
index 7e62fd27c2..d55ed0d61c 100644
--- a/apps/sam/java/build.xml
+++ b/apps/sam/java/build.xml
@@ -45,7 +45,7 @@
         </javac>
     </target>
 
-    <target name="jar" depends="compile, jarUpToDate" unless="jar.uptodate" >
+    <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
         <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
             <arg value="list" />
             <arg value="changed" />
@@ -57,6 +57,11 @@
             <arg value="[:space:]" />
             <arg value="," />
         </exec>
+    </target>
+
+    <target name="jar" depends="compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
+        <!-- set if unset -->
+        <property name="workspace.changes.tr" value="" />
         <jar destfile="./build/sam.jar" basedir="./build/obj" includes="**/*.class">
             <manifest>
                 <attribute name="Main-Class" value="net.i2p.sam.SAMBridge" />
@@ -72,6 +77,14 @@
         <uptodate property="jar.uptodate" targetfile="build/sam.jar" >
             <srcfiles dir= "build/obj" includes="**/*.class" />
         </uptodate>
+        <condition property="shouldListChanges" >
+            <and>
+                <not>
+                    <isset property="jar.uptodate" />
+                </not>
+                <isset property="mtn.available" />
+            </and>
+        </condition>
     </target>
 
     <target name="jarTest" depends="jar, compileTest">
diff --git a/apps/streaming/java/build.xml b/apps/streaming/java/build.xml
index 1351399b72..b5c842f5b9 100644
--- a/apps/streaming/java/build.xml
+++ b/apps/streaming/java/build.xml
@@ -44,7 +44,7 @@
         </javac>
     </target>
 
-    <target name="jar" depends="builddep, compile, jarUpToDate" unless="jar.uptodate" >
+    <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
         <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
             <arg value="list" />
             <arg value="changed" />
@@ -56,6 +56,11 @@
             <arg value="[:space:]" />
             <arg value="," />
         </exec>
+    </target>
+
+    <target name="jar" depends="builddep, compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
+        <!-- set if unset -->
+        <property name="workspace.changes.tr" value="" />
         <jar destfile="./build/streaming.jar" basedir="./build/obj" includes="**/*.class" >
             <manifest>
                 <attribute name="Build-Date" value="${build.timestamp}" />
@@ -69,6 +74,14 @@
         <uptodate property="jar.uptodate" targetfile="build/streaming.jar" >
             <srcfiles dir= "." includes="build/obj/**/*.class" />
         </uptodate>
+        <condition property="shouldListChanges" >
+            <and>
+                <not>
+                    <isset property="jar.uptodate" />
+                </not>
+                <isset property="mtn.available" />
+            </and>
+        </condition>
     </target>
 
     <target name="jarTest" depends="jar, compileTest">
diff --git a/apps/susidns/src/build.xml b/apps/susidns/src/build.xml
index d2dc2f121b..9fe4f3497d 100644
--- a/apps/susidns/src/build.xml
+++ b/apps/susidns/src/build.xml
@@ -67,7 +67,7 @@
 
     <target name="all" depends="war"/> 
 
-    <target name="war" depends="compile, precompilejsp, bundle, warUpToDate" unless="war.uptodate" > 
+    <target name="listChangedFiles" depends="warUpToDate" if="shouldListChanges" >
         <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
             <arg value="list" />
             <arg value="changed" />
@@ -79,6 +79,11 @@
             <arg value="[:space:]" />
             <arg value="," />
         </exec>
+    </target>
+
+    <target name="war" depends="compile, precompilejsp, bundle, warUpToDate" unless="war.uptodate" > 
+        <!-- set if unset -->
+        <property name="workspace.changes.tr" value="" />
         <war destfile="${project}.war" webxml="WEB-INF/web-out.xml">
         	<fileset dir=".">
         		<include name="WEB-INF/**/*.class"/>
@@ -102,6 +107,14 @@
         <uptodate property="war.uptodate" targetfile="${project}.war">
             <srcfiles dir= "." includes="WEB-INF/web-out.xml WEB-INF/**/*.class images/*.png css.css index.html WEB-INF/classes/${project}.properties" />
         </uptodate>
+        <condition property="shouldListChanges" >
+            <and>
+                <not>
+                    <isset property="war.uptodate" />
+                </not>
+                <isset property="mtn.available" />
+            </and>
+        </condition>
     </target>
 
     <target name="bundle" depends="compile, precompilejsp">
diff --git a/apps/susimail/build.xml b/apps/susimail/build.xml
index b38edf9b9a..7c40f0e973 100644
--- a/apps/susimail/build.xml
+++ b/apps/susimail/build.xml
@@ -22,7 +22,7 @@
     </target>
     <target name="jar" depends="compile, war" />
 
-    <target name="war" depends="compile, bundle, warUpToDate" unless="war.uptodate" >
+    <target name="listChangedFiles" depends="warUpToDate" if="shouldListChanges" >
         <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
             <arg value="list" />
             <arg value="changed" />
@@ -34,6 +34,11 @@
             <arg value="[:space:]" />
             <arg value="," />
         </exec>
+    </target>
+
+    <target name="war" depends="compile, bundle, warUpToDate, listChangedFiles" unless="war.uptodate" >
+        <!-- set if unset -->
+        <property name="workspace.changes.tr" value="" />
         <war destfile="susimail.war" webxml="src/WEB-INF/web.xml"
              basedir="src/" excludes="WEB-INF/web.xml LICENSE src/**/*">
             <manifest>
@@ -48,6 +53,14 @@
         <uptodate property="war.uptodate" targetfile="susimail.war">
             <srcfiles dir= "src" excludes="LICENSE src/**/*" />
         </uptodate>
+        <condition property="shouldListChanges" >
+            <and>
+                <not>
+                    <isset property="war.uptodate" />
+                </not>
+                <isset property="mtn.available" />
+            </and>
+        </condition>
     </target>
 
     <target name="bundle" depends="compile">
diff --git a/apps/systray/java/build.xml b/apps/systray/java/build.xml
index dc8f08afb8..4dd50f0c98 100644
--- a/apps/systray/java/build.xml
+++ b/apps/systray/java/build.xml
@@ -23,7 +23,7 @@
         </javac>
     </target>
 
-    <target name="jar" depends="compile, jarUpToDate" unless="jar.uptodate">
+    <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
         <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
             <arg value="list" />
             <arg value="changed" />
@@ -35,6 +35,11 @@
             <arg value="[:space:]" />
             <arg value="," />
         </exec>
+    </target>
+
+    <target name="jar" depends="compile, jarUpToDate, listChangedFiles" unless="jar.uptodate">
+        <!-- set if unset -->
+        <property name="workspace.changes.tr" value="" />
         <jar destfile="./build/systray.jar" basedir="./build/obj" includes="**/*.class">
             <manifest>
                 <attribute name="Main-Class" value="net.i2p.apps.systray.SysTray" />
@@ -50,6 +55,14 @@
         <uptodate property="jar.uptodate" targetfile="./build/systray.jar">
             <srcfiles dir= "build/obj" includes="**/*.class" />
         </uptodate>
+        <condition property="shouldListChanges" >
+            <and>
+                <not>
+                    <isset property="jar.uptodate" />
+                </not>
+                <isset property="mtn.available" />
+            </and>
+        </condition>
     </target>
 
     <target name="javadoc">
diff --git a/build.xml b/build.xml
index 7dc33c0864..6cc35fe096 100644
--- a/build.xml
+++ b/build.xml
@@ -159,11 +159,20 @@
         </jar>
     </target>
 
-    <target name="buildProperties" >
+    <target name="checkForMtn" >
+        <available property="mtn.available" file="_MTN" type="dir" />
+    </target>
+
+    <target name="getMtnRev" depends="checkForMtn" if="mtn.available" >
         <exec executable="mtn" outputproperty="workspace.version" errorproperty="mtn.error1" failifexecutionfails="false" >
             <arg value="automate" />
             <arg value="get_base_revision_id" />
         </exec>
+    </target>
+
+    <target name="buildProperties" depends="getMtnRev" >
+        <!-- default if not set above -->
+        <property name="workspace.version" value="unknown" />
         <tstamp>
             <format property="build.timestamp" pattern="yyyy-MM-dd HH:mm:ss z" timezone="UTC" locale="en" />
         </tstamp>
@@ -240,7 +249,7 @@
         <copy file="apps/addressbook/dist/addressbook.war" todir="build/" />
     </target>
 
-    <target name="jbigi-list-changes">
+    <target name="jbigi-list-changes" depends="checkForMtn" if="mtn.available" >
         <exec executable="mtn" outputproperty="workspace.changes.jbigi" errorproperty="mtn.error.jbigi" failifexecutionfails="false" >
             <arg value="list" />
             <arg value="changed" />
@@ -255,6 +264,8 @@
     </target>
 
     <target name="jbigi" depends="buildProperties, jbigi-list-changes" >
+        <!-- set if unset -->
+        <property name="workspace.changes.jbigi.tr" value="" />
         <jar destfile="build/jbigi.jar" whenmanifestonly="fail" >
             <fileset dir="installer/lib/jbigi" includes="*.so *.dll *.jnilib" />
             <manifest>
@@ -266,6 +277,8 @@
     </target>
 
     <target name="jbigi-windows-only" depends="buildProperties, jbigi-list-changes" >
+        <!-- set if unset -->
+        <property name="workspace.changes.jbigi.tr" value="" />
         <jar destfile="build/jbigi.jar" whenmanifestonly="fail" >
             <fileset dir="installer/lib/jbigi" includes="*windows*.dll" />
             <manifest>
@@ -277,6 +290,8 @@
     </target>
 
     <target name="jbigi-linux-only"  depends="buildProperties, jbigi-list-changes" >
+        <!-- set if unset -->
+        <property name="workspace.changes.jbigi.tr" value="" />
         <jar destfile="build/jbigi.jar"  whenmanifestonly="fail" >
             <fileset dir="installer/lib/jbigi" includes="*linux*.so" />
             <manifest>
@@ -783,9 +798,8 @@
     <target name="prepjupdatefixes" depends="prepupdate, buildWEB">
         <copy file="build/org.mortbay.jetty.jar" todir="pkg-temp/lib/" />
     </target>
-    <target name="installer" depends="preppkg, buildProperties">
-        <taskdef name="izpack" classpath="${basedir}/installer/lib/izpack/standalone-compiler.jar" classname="com.izforge.izpack.ant.IzPackTask" />
-        <mkdir dir="pkg-temp/installer" />
+
+    <target name="util-list-changes" depends="checkForMtn" if="mtn.available" >
         <exec executable="mtn" outputproperty="workspace.changes.util" errorproperty="mtn.error.util" failifexecutionfails="false" >
             <arg value="list" />
             <arg value="changed" />
@@ -797,6 +811,13 @@
             <arg value="[:space:]" />
             <arg value="," />
         </exec>
+    </target>
+
+    <target name="installer" depends="preppkg, buildProperties, util-list-changes" >
+        <taskdef name="izpack" classpath="${basedir}/installer/lib/izpack/standalone-compiler.jar" classname="com.izforge.izpack.ant.IzPackTask" />
+        <mkdir dir="pkg-temp/installer" />
+        <!-- set if unset -->
+        <property name="workspace.changes.util.tr" value="" />
         <jar destfile="./pkg-temp/installer/copy.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Copy.class net/i2p/util/FileUtil.class">
             <manifest>
                 <attribute name="Main-Class" value="net.i2p.util.Copy" />
diff --git a/core/java/build.xml b/core/java/build.xml
index 045f86ef90..d627508594 100644
--- a/core/java/build.xml
+++ b/core/java/build.xml
@@ -39,7 +39,7 @@
         </javac>
     </target>
 
-    <target name="jar" depends="compile, jarUpToDate" unless="jar.uptodate" >
+    <target name="listChangedFiles" if="mtn.available" >
         <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
             <arg value="list" />
             <arg value="changed" />
@@ -51,6 +51,11 @@
             <arg value="[:space:]" />
             <arg value="," />
         </exec>
+    </target>
+
+    <target name="jar" depends="compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
+        <!-- set if unset -->
+        <property name="workspace.changes.tr" value="" />
         <jar destfile="./build/i2p.jar" basedir="./build/obj" includes="**/*.class" >
             <manifest>
                 <attribute name="Build-Date" value="${build.timestamp}" />
diff --git a/history.txt b/history.txt
index f9a6644e90..87159487d6 100644
--- a/history.txt
+++ b/history.txt
@@ -1,5 +1,8 @@
 2011-06-08 zzz
-    * Build: Add standard manifest to jbigi.jar
+    * Build:
+      - Add standard manifest to jbigi.jar
+      - Don't do 'mtn list changed' if not in a workspace or not needed
+    * LogManager: Use DataHelper methods for loading and storing config
 
 2011-06-08 kytv
     * Update jbigi/jcpuid Windows dlls. As was done for FreeBSD and Linux, the 
diff --git a/router/java/build.xml b/router/java/build.xml
index e157dd2555..ea9f7b6135 100644
--- a/router/java/build.xml
+++ b/router/java/build.xml
@@ -53,7 +53,7 @@
         </javac>
     </target>
 
-    <target name="jar" depends="compile, jarUpToDate" unless="jar.uptodate" >
+    <target name="listChangedFiles" if="mtn.available" >
         <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
             <arg value="list" />
             <arg value="changed" />
@@ -65,6 +65,11 @@
             <arg value="[:space:]" />
             <arg value="," />
         </exec>
+    </target>
+
+    <target name="jar" depends="compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
+        <!-- set if unset -->
+        <property name="workspace.changes.tr" value="" />
         <jar destfile="./build/router.jar" basedir="./build/obj" includes="**/*.class" >
             <manifest>
                 <attribute name="Build-Date" value="${build.timestamp}" />
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 5b1ba79e39..f5c9264549 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 19;
+    public final static long BUILD = 20;
 
     /** for example "-test" */
     public final static String EXTRA = "";