diff --git a/build.xml b/build.xml
index 6461cff523..031e5d97f3 100644
--- a/build.xml
+++ b/build.xml
@@ -1202,42 +1202,44 @@
 
     <target name="installerexe" depends="launch4j">
         <condition property="noExe">
-	    <or>
-	        <os arch="ppc" />
-	        <os arch="armv5tejl" />
-	    </or>
-	</condition>
-	<condition property="noExe">
-	   <not>
-	    <or>
-	     <os name="Linux" />
-	     <os family="windows" />
-	    </or>
-	   </not>
-	</condition>
-	<ant target="doInstallerEXE" />
+            <or>
+                <os arch="ppc" />
+                <os arch="armv5tejl" />
+                <os arch="armv6l" />
+                <os arch="armv7l" />
+            </or>
+        </condition>
+        <condition property="noExe">
+            <not>
+                <or>
+                    <os name="Linux" />
+                    <os family="windows" />
+                </or>
+            </not>
+        </condition>
+        <ant target="doInstallerEXE" />
     </target>
 
     <!-- this makes i2pinstall.exe from install.jar -->
     <target name="doInstallerEXE" depends="launch4j" unless="noExe">
         <echo message="See the file &quot;build.properties&quot; if this step fails." />
-	<!-- now the installer exe -->
+        <!-- now the installer exe -->
         <launch4j configFile="./installer/i2pinstaller.xml" />
-	<!-- thazzit -->
+        <!-- thazzit -->
     </target>
 
     <!-- Custom installers -->
     <target name="installer-nowindows" depends="clean, preppkg-nowindows, izpack-patches" >
-	<izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}.jar" installerType="standard" basedir="${basedir}" />
+        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}.jar" installerType="standard" basedir="${basedir}" />
     </target>
 
 
     <target name="installer-freebsd" depends="clean, preppkg-freebsd-only, izpack-patches" >
-	<izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}_freebsd-only.jar" installerType="standard" basedir="${basedir}" />
+        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}_freebsd-only.jar" installerType="standard" basedir="${basedir}" />
     </target>
 
     <target name="installer-linux" depends="clean, preppkg-linux-only, izpack-patches" >
-	<izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}_linux-only.jar" installerType="standard" basedir="${basedir}" />
+        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}_linux-only.jar" installerType="standard" basedir="${basedir}" />
     </target>
 
 
diff --git a/history.txt b/history.txt
index 15bdeab388..b6f5c7bf1c 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,8 @@
+2012-12-24 kytv
+* Javadocs: Fix javadoc errors in the cybergarage package. Upstream bug #3598391 has been
+ filed for this issue.  If these javadoc fixes need to be reverted in the future,
+ MTN rev 5bdb7fc27e35f174001bd6105a502fd5094842e5 covers it.
+
 2012-12-22 zzz
   - i2psnark: Add announce list support (BEP 12) (ticket #778)
   - i2ptunnel: Add more tunnel quantity options for servers