diff --git a/LICENSE.txt b/LICENSE.txt
index b77f155786..9b92f0d46f 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -172,9 +172,9 @@ Launchers:
    Copyright (c) 2002-2018 EPFL, Lausanne / Lightbend, Inc. , unless otherwise specified.
    See licenses/LICENSE-Scala.md
 
-Java Service Wrapper Community Edition 32-bit 3.5.34:
+Java Service Wrapper Community Edition 32-bit 3.5.39:
    (not included in most distribution packages)
-   Copyright (C) 1999-2017 Tanuki Software, Ltd. All Rights Reserved.
+   Copyright (C) 1999-2019 Tanuki Software, Ltd. All Rights Reserved.
    See licenses/LICENSE-Wrapper.txt
 
 
diff --git a/installer/lib/wrapper/all/wrapper.jar b/installer/lib/wrapper/all/wrapper.jar
index eb45120bfc..92934e1156 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/copy.sh b/installer/lib/wrapper/copy.sh
index 8b5c7dbf89..a6ff0c30aa 100755
--- a/installer/lib/wrapper/copy.sh
+++ b/installer/lib/wrapper/copy.sh
@@ -1,7 +1,7 @@
 #
 # copy the files out of the unzipped delta pack
 #
-V=3.5.34
+V=3.5.39
 D=wrapper-delta-pack-$V
 B=$D/bin
 L=$D/lib
@@ -14,6 +14,8 @@ cp $L/libwrapper-linux-x86-32.so linux/libwrapper.so
 cp $L/libwrapper-linux-x86-64.so linux64/libwrapper.so
 cp $L/libwrapper-linux-ppcbe-32.so linux-ppc/libwrapper.so
 cp $L/libwrapper-linux-armel-32.so linux-armv5/libwrapper.so
+cp $L/libwrapper-linux-armhf-32.so linux-armv7/libwrapper.so
+cp $L/libwrapper-linux-armhf-64.so linux64-armv8/libwrapper.so
 cp $L/libwrapper-solaris-sparc-32.so solaris/libwrapper.so
 cp $L/libwrapper-macosx-universal-32.jnilib macosx/libwrapper-macosx-universal-32.jnilib
 cp $L/libwrapper-macosx-universal-64.jnilib macosx/libwrapper-macosx-universal-64.jnilib
@@ -24,6 +26,8 @@ cp $B/wrapper-linux-x86-32 linux/i2psvc
 cp $B/wrapper-linux-x86-64 linux64/i2psvc
 cp $B/wrapper-linux-ppcbe-32 linux-ppc/i2psvc
 cp $B/wrapper-linux-armel-32 linux-armv5/i2psvc
+cp $B/wrapper-linux-armhf-32 linux-armv7/i2psvc
+cp $B/wrapper-linux-armhf-64 linux64-armv8/i2psvc
 cp $B/wrapper-solaris-sparc-32 solaris/i2psvc
 cp $B/wrapper-macosx-universal-32 macosx/i2psvc-macosx-universal-32
 cp $B/wrapper-macosx-universal-64 macosx/i2psvc-macosx-universal-64
@@ -34,7 +38,7 @@ do
 	chmod -x $i/i2psvc $i/libwrapper.so
 done
 
-for i in linux-ppc linux-armv5 solaris
+for i in linux-ppc linux-armv5 linux-armv7 linux64-armv8 solaris
 do
 	chmod -x $i/i2psvc $i/libwrapper.so
 done
diff --git a/installer/lib/wrapper/freebsd/i2psvc b/installer/lib/wrapper/freebsd/i2psvc
index 07fa12bdcd..2aef544f5d 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 156e024dee..edf3d678a7 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 6a2f05c24e..261977eac8 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 eb45e19567..26623c19cf 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 a900fb1e6d..d6a1bad276 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 1944e38c44..645c906b87 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 296f7d1c41..ed29db37e2 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 53570813f7..fa8d43f6f7 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-armv7/i2psvc b/installer/lib/wrapper/linux-armv7/i2psvc
new file mode 100644
index 0000000000..74d05351c3
Binary files /dev/null and b/installer/lib/wrapper/linux-armv7/i2psvc differ
diff --git a/installer/lib/wrapper/linux-armv7/libwrapper.so b/installer/lib/wrapper/linux-armv7/libwrapper.so
new file mode 100644
index 0000000000..4d5cf38ac0
Binary files /dev/null and b/installer/lib/wrapper/linux-armv7/libwrapper.so differ
diff --git a/installer/lib/wrapper/linux-ppc/i2psvc b/installer/lib/wrapper/linux-ppc/i2psvc
index 07d7ea3a52..707b99a065 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 7036d1cedb..c8ca34c6f9 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 28110fedae..44a3ff6231 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 e9036ca985..04c0b319d8 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-armv8/i2psvc b/installer/lib/wrapper/linux64-armv8/i2psvc
new file mode 100644
index 0000000000..d6dbdd730a
Binary files /dev/null and b/installer/lib/wrapper/linux64-armv8/i2psvc differ
diff --git a/installer/lib/wrapper/linux64-armv8/libwrapper.so b/installer/lib/wrapper/linux64-armv8/libwrapper.so
new file mode 100644
index 0000000000..a02d96951a
Binary files /dev/null and b/installer/lib/wrapper/linux64-armv8/libwrapper.so differ
diff --git a/installer/lib/wrapper/linux64/i2psvc b/installer/lib/wrapper/linux64/i2psvc
index 619f4f4005..bf19ea5d23 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 8e243310e4..9932f0ba41 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 fc3a901c5f..081480272d 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 e7a5f460f2..b245a12a1f 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 6157663969..48f0013f14 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 572238a701..c73e5d5390 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 cd07cfd469..4377b28a65 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 7bb68e9b7e..3c1e1d4657 100644
Binary files a/installer/lib/wrapper/solaris/libwrapper.so and b/installer/lib/wrapper/solaris/libwrapper.so differ
diff --git a/installer/resources/postinstall.sh b/installer/resources/postinstall.sh
index bcc3364524..c23a3c8da9 100644
--- a/installer/resources/postinstall.sh
+++ b/installer/resources/postinstall.sh
@@ -40,8 +40,12 @@ case $HOST_OS in
     debian | fedora | gentoo | linux | mandrake | redhat | suse )
         # Tanuki-built arm wrapper works on armv5 and armv7 but not on Raspberry Pi armv6.
         # Wrapper we built for Raspberry Pi does not work on Trimslice armv7.
-        if [ `echo $OS_ARCH |grep armv7` ]; then
-            wrapperpath="./lib/wrapper/linux-armv5"
+        if [ `echo $OS_ARCH |grep armv8` ]; then
+            wrapperpath="./lib/wrapper/linux64-armv8"
+        elif [ `echo $OS_ARCH |grep aarch64` ]; then
+            wrapperpath="./lib/wrapper/linux64-armv8"
+        elif [ `echo $OS_ARCH |grep armv7` ]; then
+            wrapperpath="./lib/wrapper/linux-armv7"
         elif [ `echo $OS_ARCH |grep armv6` ]; then
             wrapperpath="./lib/wrapper/linux-armv6"
         elif [ `echo $OS_ARCH |grep arm` ]; then