diff --git a/build.xml b/build.xml
index 8ab784ef3..20ff3d158 100644
--- a/build.xml
+++ b/build.xml
@@ -1035,6 +1035,12 @@
         <copy todir="pkg-temp/lib/wrapper/solaris/">
             <fileset dir="installer/lib/wrapper/solaris/" excludes="*.txt" />
         </copy>
+     <!-- Force using the new wrapper.jar.
+          The new jar with the old windows binaries will output a warning on windows.
+          We do not generate release files from this target.
+          See preppkg-windows-only target below.
+      -->
+        <copy overwrite="true" file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
     </target>
 
     <target name="preppkg-nowindows" depends="preppkg-linux, preppkg-freebsd, preppkg-osx, jbigi-nowindows">
@@ -1139,7 +1145,6 @@
         <copy file="installer/resources/install_i2p_service_winnt.bat" todir="pkg-temp/" />
         <copy file="installer/resources/set_config_dir_for_nt_service.bat" todir="pkg-temp/" />
         <copy file="installer/resources/uninstall_i2p_service_winnt.bat" todir="pkg-temp/" />
-        <copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
         <copy file="build/utility.jar" todir="pkg-temp" />
         <copy todir="pkg-temp/lib/wrapper/win32/">
             <fileset dir="installer/lib/wrapper/win32/" excludes="*.txt" />
@@ -1151,7 +1156,13 @@
 
     <target name="preppkg-windows-only" depends="preppkg-windows, jbigi-windows-only">
         <copy file="build/jbigi.jar" todir="pkg-temp/lib" />
+     <!-- Win binaries are down-rev from the others, so use the old jar.
+          This will not overwrite, so preppkg (for all OSes) will get the new jar with
+          the old binaries, which will probably work but will output a warning.
+          The windows-only installer will get the correct jar.
         <copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
+      -->
+        <copy overwrite="true" file="installer/lib/wrapper/win-all/wrapper.jar" todir="pkg-temp/lib" />
     </target>
 
     <!-- see targets below for conditional copying -->
diff --git a/history.txt b/history.txt
index 12e909da4..76bd88307 100644
--- a/history.txt
+++ b/history.txt
@@ -3,6 +3,8 @@
    a backwards clock shift, caused graphs to be blank
    and various router, streaming, and i2ptunnel
    degradations over time (ticket #1776)
+ * Wrapper: Update to wrapper 3.5.29, except for Windows.
+   Fixes wrapper failure on FreeBSD 10 (ticket #1118)
 
 2016-05-01 zzz
  * Build: Compile resource bundles from ant, not msgfmt,
diff --git a/installer/lib/wrapper/all/wrapper.jar b/installer/lib/wrapper/all/wrapper.jar
index a47bc1747..33d6c2656 100644
Binary files a/installer/lib/wrapper/all/wrapper.jar and b/installer/lib/wrapper/all/wrapper.jar differ
diff --git a/installer/lib/wrapper/freebsd/i2psvc b/installer/lib/wrapper/freebsd/i2psvc
index d01778a53..87ae2af2e 100644
Binary files a/installer/lib/wrapper/freebsd/i2psvc and b/installer/lib/wrapper/freebsd/i2psvc differ
diff --git a/installer/lib/wrapper/freebsd/libwrapper.so b/installer/lib/wrapper/freebsd/libwrapper.so
index 0e2513fa7..cd3ccfdad 100644
Binary files a/installer/lib/wrapper/freebsd/libwrapper.so and b/installer/lib/wrapper/freebsd/libwrapper.so differ
diff --git a/installer/lib/wrapper/freebsd64/i2psvc b/installer/lib/wrapper/freebsd64/i2psvc
index d5b8f0327..b980b9c0d 100644
Binary files a/installer/lib/wrapper/freebsd64/i2psvc and b/installer/lib/wrapper/freebsd64/i2psvc differ
diff --git a/installer/lib/wrapper/freebsd64/libwrapper.so b/installer/lib/wrapper/freebsd64/libwrapper.so
index 635219850..e1d4d51e2 100644
Binary files a/installer/lib/wrapper/freebsd64/libwrapper.so and b/installer/lib/wrapper/freebsd64/libwrapper.so differ
diff --git a/installer/lib/wrapper/linux-armv5/i2psvc b/installer/lib/wrapper/linux-armv5/i2psvc
index 952d8506d..a7fcbfad6 100644
Binary files a/installer/lib/wrapper/linux-armv5/i2psvc and b/installer/lib/wrapper/linux-armv5/i2psvc differ
diff --git a/installer/lib/wrapper/linux-armv5/libwrapper.so b/installer/lib/wrapper/linux-armv5/libwrapper.so
index 3161cbc08..389b2494a 100644
Binary files a/installer/lib/wrapper/linux-armv5/libwrapper.so and b/installer/lib/wrapper/linux-armv5/libwrapper.so differ
diff --git a/installer/lib/wrapper/linux-armv6/README.txt b/installer/lib/wrapper/linux-armv6/README.txt
index 4bb4095e6..94866718c 100644
--- a/installer/lib/wrapper/linux-armv6/README.txt
+++ b/installer/lib/wrapper/linux-armv6/README.txt
@@ -1,7 +1,13 @@
 Wrapper build instructions (Ubuntu or Raspbian):
 
        apt-get install default-jdk ant
+       export JAVA_HOME=/usr/lib/jvm/default-java
        ant -Dbits=32 compile-c-unix
        mv bin/wrapper bin/i2psvc
        strip --strip-unneeded bin/i2psvc lib/libwrapper.so
-
+       cp bin/i2psvc $I2P
+       cp lib/libwrapper.so $I2P/lib
+       cp /path/to/wrapper-delta-pack-3.5.xx/lib/wrapper.jar $I2P/lib
+       (test it)
+       cp bin/i2psvc lib/libwrapper.so /path/to/installer/lib/wrapper/linux-armv6
+       chmod -x i2psvc librapper.so
diff --git a/installer/lib/wrapper/linux-armv6/i2psvc b/installer/lib/wrapper/linux-armv6/i2psvc
index f0036b2d6..856468c0d 100644
Binary files a/installer/lib/wrapper/linux-armv6/i2psvc and b/installer/lib/wrapper/linux-armv6/i2psvc differ
diff --git a/installer/lib/wrapper/linux-armv6/libwrapper.so b/installer/lib/wrapper/linux-armv6/libwrapper.so
index c052c54e2..14166be6b 100644
Binary files a/installer/lib/wrapper/linux-armv6/libwrapper.so and b/installer/lib/wrapper/linux-armv6/libwrapper.so differ
diff --git a/installer/lib/wrapper/linux-ppc/i2psvc b/installer/lib/wrapper/linux-ppc/i2psvc
index 23b17b8a3..3f77c7b6b 100644
Binary files a/installer/lib/wrapper/linux-ppc/i2psvc and b/installer/lib/wrapper/linux-ppc/i2psvc differ
diff --git a/installer/lib/wrapper/linux-ppc/libwrapper.so b/installer/lib/wrapper/linux-ppc/libwrapper.so
index e9d2602a0..8cde6ebdd 100644
Binary files a/installer/lib/wrapper/linux-ppc/libwrapper.so and b/installer/lib/wrapper/linux-ppc/libwrapper.so differ
diff --git a/installer/lib/wrapper/linux/i2psvc b/installer/lib/wrapper/linux/i2psvc
index 5fa8e2afd..2bf1b6bad 100644
Binary files a/installer/lib/wrapper/linux/i2psvc and b/installer/lib/wrapper/linux/i2psvc differ
diff --git a/installer/lib/wrapper/linux/libwrapper.so b/installer/lib/wrapper/linux/libwrapper.so
index 05b12e780..61ae72d9f 100644
Binary files a/installer/lib/wrapper/linux/libwrapper.so and b/installer/lib/wrapper/linux/libwrapper.so differ
diff --git a/installer/lib/wrapper/linux64/i2psvc b/installer/lib/wrapper/linux64/i2psvc
index 3d9c1940b..3d01020f9 100644
Binary files a/installer/lib/wrapper/linux64/i2psvc and b/installer/lib/wrapper/linux64/i2psvc differ
diff --git a/installer/lib/wrapper/linux64/libwrapper.so b/installer/lib/wrapper/linux64/libwrapper.so
index 65e6878a6..7d5515e4b 100644
Binary files a/installer/lib/wrapper/linux64/libwrapper.so and b/installer/lib/wrapper/linux64/libwrapper.so differ
diff --git a/installer/lib/wrapper/macosx/i2psvc-macosx-universal-32 b/installer/lib/wrapper/macosx/i2psvc-macosx-universal-32
index 57fdb5663..e9989af94 100644
Binary files a/installer/lib/wrapper/macosx/i2psvc-macosx-universal-32 and b/installer/lib/wrapper/macosx/i2psvc-macosx-universal-32 differ
diff --git a/installer/lib/wrapper/macosx/i2psvc-macosx-universal-64 b/installer/lib/wrapper/macosx/i2psvc-macosx-universal-64
index 1c2fff181..dbb229007 100644
Binary files a/installer/lib/wrapper/macosx/i2psvc-macosx-universal-64 and b/installer/lib/wrapper/macosx/i2psvc-macosx-universal-64 differ
diff --git a/installer/lib/wrapper/macosx/libwrapper-macosx-universal-32.jnilib b/installer/lib/wrapper/macosx/libwrapper-macosx-universal-32.jnilib
index 52da8f372..4b9df67bb 100644
Binary files a/installer/lib/wrapper/macosx/libwrapper-macosx-universal-32.jnilib and b/installer/lib/wrapper/macosx/libwrapper-macosx-universal-32.jnilib differ
diff --git a/installer/lib/wrapper/macosx/libwrapper-macosx-universal-64.jnilib b/installer/lib/wrapper/macosx/libwrapper-macosx-universal-64.jnilib
index 27c96d72f..a56b9ab64 100644
Binary files a/installer/lib/wrapper/macosx/libwrapper-macosx-universal-64.jnilib and b/installer/lib/wrapper/macosx/libwrapper-macosx-universal-64.jnilib differ
diff --git a/installer/lib/wrapper/solaris/i2psvc b/installer/lib/wrapper/solaris/i2psvc
index 369a07db8..1f260545c 100644
Binary files a/installer/lib/wrapper/solaris/i2psvc and b/installer/lib/wrapper/solaris/i2psvc differ
diff --git a/installer/lib/wrapper/solaris/libwrapper.so b/installer/lib/wrapper/solaris/libwrapper.so
index f3f7e6e4f..0ea0fda88 100644
Binary files a/installer/lib/wrapper/solaris/libwrapper.so and b/installer/lib/wrapper/solaris/libwrapper.so differ
diff --git a/installer/lib/wrapper/win-all/wrapper.jar b/installer/lib/wrapper/win-all/wrapper.jar
new file mode 100644
index 000000000..a47bc1747
Binary files /dev/null and b/installer/lib/wrapper/win-all/wrapper.jar differ
diff --git a/installer/resources/i2prouter b/installer/resources/i2prouter
index 0c69a59b0..6332a36f3 100644
--- a/installer/resources/i2prouter
+++ b/installer/resources/i2prouter
@@ -206,13 +206,15 @@ unsupported() {
 
 freebsd10() {
     echo
-    echo "The current version of the Tanuki wrapper does not"
-    echo "support FreeBSD 10."
+    echo "The current version of the Tanuki wrapper that is bundled"
+    echo "with I2P does not support FreeBSD 10."
     echo
-    echo "See https://trac.i2p2.de/ticket/1118 for more information"
-    echo "and a workaround for this issue."
+    echo "See http://trac.i2p2.de/ticket/1118#comment:13 for a work-around."
+    echo "After applying the work-around, as a normal user or a dedicated"
+    echo "i2p user, you can then run:"
+    echo "$ ./i2prouter start"
     echo
-    echo "In the meantime, you may start I2P by running the script"
+    echo "Or, you may also start I2P by running the script:"
     echo "${I2P}/runplain.sh"
     echo
 }
@@ -227,11 +229,11 @@ failed() {
                     ;;
                 *)
                     # We should never get here on recent versions of FreeBSD
-                    if ! $(pkg_info -E 'libiconv*' > /dev/null 2>&1); then
+                    if ! $(pkg info -E 'libiconv*' > /dev/null 2>&1); then
                         echo
                         echo "The wrapper requires libiconv."
                         echo
-                        echo "It can be installed with pkg_add -r libiconv"
+                        echo "It can be installed with pkg install libiconv"
                         echo
                     fi
                     ;;
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index f2522cd4e..7ca1a3ec2 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 = 9;
+    public final static long BUILD = 10;
 
     /** for example "-test" */
     public final static String EXTRA = "";