diff --git a/debian/patches/0001-path-substitution.patch b/debian/patches/0001-path-substitution.patch
index 1d971e8cff..58a67d7070 100644
--- a/debian/patches/0001-path-substitution.patch
+++ b/debian/patches/0001-path-substitution.patch
@@ -34,7 +34,7 @@ Debian wrapper.config to try to prevent confusion.
  # You shall use it only in accordance with the terms of the
 @@ -24,21 +24,12 @@
  # These settings can be modified to fit the needs of your application
- # Optimized for use with version 3.5.20 of the Wrapper.
+ # Optimized for use with version 3.5.22 of the Wrapper.
  
 -# Paths
 -# Note that (percent)INSTALL_PATH, (percent)USER_HOME,  and (percent)SYSTEM_java_io_tmpdir
@@ -146,7 +146,7 @@ Debian wrapper.config to try to prevent confusion.
 @@ -944,7 +879,7 @@
  
          # The string passed to eval must handles spaces in paths correctly.
-         COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.java.command=\"$JAVABINARY\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" $ANCHORPROP $STATUSPROP $COMMANDPROP $LOCKPROP $LOGPROP wrapper.script.version=3.5.20 $ADDITIONAL_PARA"
+         COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.java.command=\"$JAVABINARY\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" $ANCHORPROP $STATUSPROP $COMMANDPROP $LOCKPROP $LOGPROP wrapper.script.version=3.5.22 $ADDITIONAL_PARA"
 -        eval $COMMAND_LINE || failed
 +        eval $COMMAND_LINE
      else
diff --git a/history.txt b/history.txt
index 368e25bad4..2532ea8a2e 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,12 @@
+2013-11-14 kytv
+ * Update Java Service Wrapper to v3.5.22
+    - Windows: 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,
+      Icedtea6 6b27-1.12.5-1+rpi1 and stripped
+    - All other binaries are from the "community edition" deltapack offered by
+      Tanuki.
+
 2013-11-14 zzz
  * Tunnels: Fix reception of encrypted responses to LS lookups (ticket #1125)
 
diff --git a/installer/lib/wrapper/all/wrapper.jar b/installer/lib/wrapper/all/wrapper.jar
index f690457ab9..9b163866e4 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/README.txt b/installer/lib/wrapper/freebsd/README.txt
index a5c718b5f2..9a4ddc9753 100644
--- a/installer/lib/wrapper/freebsd/README.txt
+++ b/installer/lib/wrapper/freebsd/README.txt
@@ -1,8 +1,8 @@
-Basic instructions for BSD
---------------------------
+Basic instructions for FreeBSD < 10
+-----------------------------------
 
 Prerequisites for compiling the wrapper can be installed with:
-	pkg_add -r apache-ant gmake openjdk6
+	pkg_add -r apache-ant gmake openjdk7
 
 One the prereqs are installed, cd into the wrapper source and run
 
diff --git a/installer/lib/wrapper/freebsd/i2psvc b/installer/lib/wrapper/freebsd/i2psvc
index 6ea7d36c78..b5f664adda 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 83b6971e6b..bcbed85247 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 e238e435c8..0d9b7ec946 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 d8ad195000..800ad56173 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 7d4d19cbe3..f3b4511c43 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 c13d07ffb9..144599f33d 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 7eb4858724..4bb4095e6c 100644
--- a/installer/lib/wrapper/linux-armv6/README.txt
+++ b/installer/lib/wrapper/linux-armv6/README.txt
@@ -1,7 +1,7 @@
-Wrapper build instructions (Ubuntu):
+Wrapper build instructions (Ubuntu or Raspbian):
+
+       apt-get install default-jdk ant
+       ant -Dbits=32 compile-c-unix
+       mv bin/wrapper bin/i2psvc
+       strip --strip-unneeded bin/i2psvc lib/libwrapper.so
 
-export ANT_HOME=/usr/share/ant
-export JAVA_HOME=/usr/lib/jvm/java-6-openjdk
-cp src/c/Makefile-linux-x86-32.make src/c/Makefile-linux-arm-32.make
-build32.sh
-strip lib/libwrapper.so bin/wrapper
diff --git a/installer/lib/wrapper/linux-armv6/i2psvc b/installer/lib/wrapper/linux-armv6/i2psvc
index 89838287da..7b88c05753 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 e062387684..bb32f4b450 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 efa3883cd1..3992d29e5b 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 dc984fd5e0..8378d8eb75 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 b07efe9ea4..aa272f52df 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 cef2dd97a0..3efcf45015 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 cc112a52e0..fa2255e865 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 1107ffb595..57a1550fe3 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 1a82cf8031..f64f442f3c 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 96bf81413b..f556a98866 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 86ce5610f8..f2d50cb7dc 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 2e635aa052..a1350becfd 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 025e38b617..8ebc876959 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 02d9e4947f..19a95591c7 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 a0dbf2eeb1..2eda7d78b9 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 5b277563ff..95b61f4e17 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 2dc0467c42..b442e10a5f 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
new file mode 100644
index 0000000000..5b5b2b1e72
--- /dev/null
+++ b/installer/lib/wrapper/win64/Makefile-windows-x86-64.nmake
@@ -0,0 +1,62 @@
+# Copyright (c) 1999, 2011 Tanuki Software, Ltd.
+# http://www.tanukisoftware.com
+# All rights reserved.
+#
+# This software is the proprietary information of Tanuki Software.
+# You shall use it only in accordance with the terms of the
+# license agreement you entered into with Tanuki Software.
+# http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
+
+PROJ = wrapper
+
+COMPILE = cl /D "WIN32" /D "WIN64" /D "NDEBUG" /FD /EHsc /MT /W3 /nologo /c /Zi /errorReport:prompt /D "_CRT_SECURE_NO_DEPRECATE" /D "UNICODE" /D "_UNICODE" /D "_WIN32_WINNT=0x0500"
+LINK = link /NOLOGO /MANIFEST /DEBUG /MACHINE:AMD64 /ERRORREPORT:PROMPT DelayImp.lib
+RC = rc
+
+# EXE Definitions
+EXE_OUTDIR = $(PROJ)32_VC8__Win64_Release
+EXE_OBJS = $(EXE_OUTDIR)\wrapper_i18n.obj $(EXE_OUTDIR)\logger.obj $(EXE_OUTDIR)\property.obj $(EXE_OUTDIR)\wrapper.obj $(EXE_OUTDIR)\wrapper_win.obj $(EXE_OUTDIR)\wrappereventloop.obj $(EXE_OUTDIR)\wrapper_file.obj $(EXE_OUTDIR)\wrapperinfo.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
+
+# DLL Definitions
+DLL_OUTDIR = $(PROJ)JNI32_VC8__Win64_Release
+DLL_OBJS = $(DLL_OUTDIR)\wrapper_i18n.obj $(DLL_OUTDIR)\wrapperjni.obj $(DLL_OUTDIR)\wrapperjni_win.obj $(DLL_OUTDIR)\wrapperinfo.obj
+DLL_LIBS = shell32.lib advapi32.lib user32.lib
+DLL_COMPILE_OPTS = /Od  /I "..\" /I ".\" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "_WINDOWS" /D "_USRDLL" /D "DECODERJNI_VC8_EXPORTS" /D "_WINDLL"
+DLL_LINK_OPTS = /INCREMENTAL /DLL /SUBSYSTEM:WINDOWS /MANIFESTFILE:"$(DLL_OUTDIR)\$(PROJ).dll.intermediate.manifest" /PDB:"$(DLL_OUTDIR)\$(PROJ).pdb"
+
+
+all: $(EXE_OUTDIR) $(DLL_OUTDIR) $(PROJ).exe $(PROJ).dll
+
+# Define project specific macros
+
+#----- If OUTDIR does not exist, then create directory
+$(EXE_OUTDIR) :
+    if not exist "$(EXE_OUTDIR)/$(NULL)" mkdir $(EXE_OUTDIR)
+$(DLL_OUTDIR) :
+    if not exist "$(DLL_OUTDIR)/$(NULL)" mkdir $(DLL_OUTDIR)
+
+# Inference rule for updating the object files
+.c{$(EXE_OUTDIR)}.obj:
+    $(COMPILE) $(EXE_COMPILE_OPTS) /Fo"$(EXE_OUTDIR)\\" /Fd"$(EXE_OUTDIR)\\" $**
+.c{$(DLL_OUTDIR)}.obj:
+    $(COMPILE) $(DLL_COMPILE_OPTS) /Fo"$(DLL_OUTDIR)\\" /Fd"$(DLL_OUTDIR)\\" $**
+
+# Build rule for resource file
+$(EXE_OUTDIR)\$(PROJ).res: $(PROJ).rc $(RC_DEP)
+    $(RC) /fo"$(EXE_OUTDIR)/$(PROJ).res" $(PROJ).rc
+$(DLL_OUTDIR)\$(PROJ).res: $(PROJ).rc $(RC_DEP)
+    $(RC) /fo"$(DLL_OUTDIR)/$(PROJ).res" $(PROJ).rc
+$(PROJ).exe: $(BASE_OBJS) $(EXE_OBJS) $(EXE_OUTDIR)\$(PROJ).res
+    $(LINK) $(EXE_LINK_OPTS) $(EXE_OBJS) $(EXE_LIBS) $(EXE_OUTDIR)\$(PROJ).res /OUT:"..\..\bin\$(PROJ).exe"
+
+$(PROJ).dll: $(BASE_OBJS) $(DLL_OBJS) $(DLL_OUTDIR)\$(PROJ).res
+    $(LINK) $(DLL_LINK_OPTS) $(DLL_OBJS) $(DLL_LIBS) $(DLL_OUTDIR)\$(PROJ).res /OUT:"..\..\lib\$(PROJ).dll"
+
+clean:
+    if exist $(EXE_OUTDIR)/$(NULL) rd /s /q $(EXE_OUTDIR)
+    if exist $(DLL_OUTDIR)/$(NULL) rd /s /q $(DLL_OUTDIR)
+    if exist ..\..\bin\$(PROJ).exe del /q ..\..\bin\$(PROJ).exe
+    if exist ..\..\lib\$(PROJ).dll del /q ..\..\lib\$(PROJ).dll
diff --git a/installer/lib/wrapper/win64/README-x64-win.txt b/installer/lib/wrapper/win64/README-x64-win.txt
index 65c8dcac80..34b0134550 100644
--- a/installer/lib/wrapper/win64/README-x64-win.txt
+++ b/installer/lib/wrapper/win64/README-x64-win.txt
@@ -1,7 +1,6 @@
-Changes may be needed for newer versions than 3.5.20.
+Changes may be needed for newer versions than 3.5.22.
 
-To use the patch in this directory, copy Makefile-windows-x86-32.nmake to
-Makefile-windows-x86-64.nmake then "patch < x64-win.patch".
+Copy Makefile-windows-x86-64.nmake to src\c.
 
 Copy the itoopie icon to src\c\wrapper.ico.
 
diff --git a/installer/lib/wrapper/win64/wrapper.dll b/installer/lib/wrapper/win64/wrapper.dll
index dc8d136664..14f717dbf6 100644
Binary files a/installer/lib/wrapper/win64/wrapper.dll and b/installer/lib/wrapper/win64/wrapper.dll differ
diff --git a/installer/lib/wrapper/win64/x64-win.patch b/installer/lib/wrapper/win64/x64-win.patch
deleted file mode 100644
index 2194801131..0000000000
--- a/installer/lib/wrapper/win64/x64-win.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- Makefile-windows-x86-64.nmake	2011-09-29 20:34:25.447939000 +0000
-+++ Makefile-windows-x86-64.nmake	2011-09-29 20:51:57.297170000 +0000
-@@ -9,19 +9,19 @@
- 
- PROJ = wrapper
- 
--COMPILE = cl /D "WIN32" /D "NDEBUG" /FD /EHsc /MT /W3 /nologo /c /Zi /errorReport:prompt /D "_CRT_SECURE_NO_DEPRECATE" /D "UNICODE" /D "_UNICODE" /D "_WIN32_WINNT=0x0500"
--LINK = link /NOLOGO /MANIFEST /DEBUG /MACHINE:X86 /ERRORREPORT:PROMPT DelayImp.lib
-+COMPILE = cl /D "WIN32" /D "WIN64" /D "NDEBUG" /FD /EHsc /MT /W3 /nologo /c /Zi /errorReport:prompt /D "_CRT_SECURE_NO_DEPRECATE" /D "UNICODE" /D "_UNICODE" /D "_WIN32_WINNT=0x0500"
-+LINK = link /NOLOGO /MANIFEST /DEBUG /MACHINE:AMD64 /ERRORREPORT:PROMPT DelayImp.lib
- RC = rc
- 
- # EXE Definitions
--EXE_OUTDIR = $(PROJ)32_VC8__Win32_Release
-+EXE_OUTDIR = $(PROJ)32_VC8__Win64_Release
- EXE_OBJS = $(EXE_OUTDIR)\wrapper_i18n.obj $(EXE_OUTDIR)\logger.obj $(EXE_OUTDIR)\property.obj $(EXE_OUTDIR)\wrapper.obj $(EXE_OUTDIR)\wrapper_win.obj $(EXE_OUTDIR)\wrappereventloop.obj $(EXE_OUTDIR)\wrapper_file.obj $(EXE_OUTDIR)\wrapperinfo.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
- 
- # DLL Definitions
--DLL_OUTDIR = $(PROJ)JNI32_VC8__Win32_Release
-+DLL_OUTDIR = $(PROJ)JNI32_VC8__Win64_Release
- DLL_OBJS = $(DLL_OUTDIR)\wrapper_i18n.obj $(DLL_OUTDIR)\wrapperjni.obj $(DLL_OUTDIR)\wrapperjni_win.obj $(DLL_OUTDIR)\wrapperinfo.obj
- DLL_LIBS = shell32.lib advapi32.lib user32.lib
- DLL_COMPILE_OPTS = /Od  /I "..\" /I ".\" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "_WINDOWS" /D "_USRDLL" /D "DECODERJNI_VC8_EXPORTS" /D "_WINDLL"