diff --git a/history.txt b/history.txt
index 763e1415a0..cb972bde16 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,12 @@
+2014-07-03 kytv
+ * Update Java Service Wrapper to v3.5.25
+    - Windows: x86 and x64 versions self-compiled with VS2010 in
+      Windows 7. The icon has been changed from Tanuki's default to Itoopie.
+    - Linux ARMv6: Compiled on a RaspberryPi using gcc 4.6.3-14+rpi1,
+      Oracle Java 1.7.0+update40 and stripped
+    - All other binaries are from the "community edition" deltapack offered by
+      Tanuki.
+
 2014-06-29 zzz
  * NetDB: Fix handling reseed URLs with ports (ticket #1278)
 
diff --git a/installer/lib/wrapper/all/wrapper.jar b/installer/lib/wrapper/all/wrapper.jar
index 9b163866e4..a47bc1747b 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 b5f664adda..d01778a537 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 bcbed85247..0e2513fa7b 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 0d9b7ec946..d5b8f0327b 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 800ad56173..6352198502 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 f3b4511c43..952d8506da 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 144599f33d..3161cbc08c 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/i2psvc b/installer/lib/wrapper/linux-armv6/i2psvc
index 7b88c05753..f0036b2d69 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 bb32f4b450..c052c54e28 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 3992d29e5b..23b17b8a39 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 8378d8eb75..e9d2602a03 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 aa272f52df..5fa8e2afd7 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 3efcf45015..05b12e7807 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 fa2255e865..3d9c1940b8 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 57a1550fe3..65e6878a6d 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 f64f442f3c..57fdb5663e 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 f556a98866..1c2fff1814 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 f2d50cb7dc..52da8f3728 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 a1350becfd..27c96d72fe 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 8ebc876959..369a07db84 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 19a95591c7..f3f7e6e4fb 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/win32/I2Psvc.exe b/installer/lib/wrapper/win32/I2Psvc.exe
index 2eda7d78b9..79f7eb2cb1 100644
Binary files a/installer/lib/wrapper/win32/I2Psvc.exe and b/installer/lib/wrapper/win32/I2Psvc.exe differ
diff --git a/installer/lib/wrapper/win32/wrapper.dll b/installer/lib/wrapper/win32/wrapper.dll
index 95b61f4e17..80bf9bf49f 100644
Binary files a/installer/lib/wrapper/win32/wrapper.dll and b/installer/lib/wrapper/win32/wrapper.dll differ
diff --git a/installer/lib/wrapper/win64/I2Psvc.exe b/installer/lib/wrapper/win64/I2Psvc.exe
index b442e10a5f..a208d13c8a 100644
Binary files a/installer/lib/wrapper/win64/I2Psvc.exe and b/installer/lib/wrapper/win64/I2Psvc.exe differ
diff --git a/installer/lib/wrapper/win64/Makefile-windows-x86-64.nmake b/installer/lib/wrapper/win64/Makefile-windows-x86-64.nmake
index 0e3f87ad99..67670fadaa 100644
--- a/installer/lib/wrapper/win64/Makefile-windows-x86-64.nmake
+++ b/installer/lib/wrapper/win64/Makefile-windows-x86-64.nmake
@@ -16,7 +16,7 @@ RC = rc
 
 # EXE Definitions
 EXE_OUTDIR = $(PROJ)32_VC8__Win64_Release
-EXE_OBJS = $(EXE_OUTDIR)\wrapper.obj $(EXE_OUTDIR)\wrapperinfo.obj $(EXE_OUTDIR)\wrappereventloop.obj $(EXE_OUTDIR)\wrapper_win.obj $(EXE_OUTDIR)\property.obj $(EXE_OUTDIR)\logger.obj $(EXE_OUTDIR)\wrapper_file.obj $(EXE_OUTDIR)\wrapper_i18n.obj $(EXE_OUTDIR)\test.obj $(EXE_OUTDIR)\wrapper_hashmap.obj
+EXE_OBJS = $(EXE_OUTDIR)\wrapper.obj $(EXE_OUTDIR)\wrapperinfo.obj $(EXE_OUTDIR)\wrappereventloop.obj $(EXE_OUTDIR)\wrapper_win.obj $(EXE_OUTDIR)\property.obj $(EXE_OUTDIR)\logger.obj $(EXE_OUTDIR)\wrapper_file.obj $(EXE_OUTDIR)\wrapper_i18n.obj $(EXE_OUTDIR)\wrapper_hashmap.obj
 EXE_LIBS = mpr.lib shell32.lib netapi32.lib wsock32.lib shlwapi.lib advapi32.lib user32.lib Crypt32.lib Wintrust.lib pdh.lib
 EXE_COMPILE_OPTS = /O2 /GL /D "_CONSOLE"
 EXE_LINK_OPTS = /INCREMENTAL:NO /SUBSYSTEM:CONSOLE /MANIFESTFILE:"$(EXE_OUTDIR)\$(PROJ).exe.intermediate.manifest" /PDB:"$(EXE_OUTDIR)\$(PROJ).pdb" /OPT:REF /OPT:ICF /LTCG
diff --git a/installer/lib/wrapper/win64/README-x64-win.txt b/installer/lib/wrapper/win64/README-x64-win.txt
index 614b72ff8c..6afc2d0969 100644
--- a/installer/lib/wrapper/win64/README-x64-win.txt
+++ b/installer/lib/wrapper/win64/README-x64-win.txt
@@ -1,4 +1,4 @@
-Changes may be needed for newer versions than 3.5.23.
+Changes may be needed for newer versions than 3.5.25.
 
 Copy Makefile-windows-x86-64.nmake to src\c.
 
diff --git a/installer/lib/wrapper/win64/wrapper.dll b/installer/lib/wrapper/win64/wrapper.dll
index 14f717dbf6..afa5a8d5dd 100644
Binary files a/installer/lib/wrapper/win64/wrapper.dll and b/installer/lib/wrapper/win64/wrapper.dll differ