diff --git a/LICENSE.txt b/LICENSE.txt
index b77f155786a07da05376083e3d05a5bf4bd377fc..9b92f0d46f66ad1e3e7398290039127a1805d561 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 eb45120bfc92c8cb2eded82375bd88f0aee13f0b..92934e115629bdfd41d95798a51cb7e5bda5066d 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 8b5c7dbf8921b4c5e0244e7695f8378e9263cd2f..a6ff0c30aa445a6a48efc9c5ec15a9247556aac1 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 07fa12bdcd52be2fe1f3ff9d718bf2b625e8bf2e..2aef544f5dbf9607ee805b159487ec765091f94c 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 156e024dee00996d3823ea53e69e51ab4d4e1a83..edf3d678a7acb2f4e867c9c7a28da238ea55c915 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 6a2f05c24e14571ac942eceb867948a1334b7014..261977eac8c19b9a0dda7f35a825227cfd24a7b8 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 eb45e19567293a0ea6bb7cfbe9ad9cf160d47919..26623c19cf8bff60e722bae2bafa83b23fb5946b 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 a900fb1e6d99ea995ea143f271296cfb99993735..d6a1bad276052b28ed39fb17890d4f389844a006 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 1944e38c44d0a50700d85e1fc5e9ca50c20c3832..645c906b87796e425d1d03d5818aa2c38f32ed8e 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 296f7d1c41270e564554d11694576b6ccdf076c4..ed29db37e2a0fe5514e5b408417ddd3d7d50ae9f 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 53570813f723d638f7de93dc5262737288f56b09..fa8d43f6f7b38416fd210a2aad5a08db272cacd3 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 0000000000000000000000000000000000000000..74d05351c34500ae713ecb362d670a0ed47a8fe4
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 0000000000000000000000000000000000000000..4d5cf38ac0e8b44c75777a814a86988d0fd54366
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 07d7ea3a520d5adbb133e077fb1b9e382fb595cb..707b99a0654db6ef6de7ca845de9b947b74b2f3f 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 7036d1cedbbed9e15e77fca9ff8e2d4e44ea554f..c8ca34c6f9365c0e134be6194cdab954387acb0d 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 28110fedaeedc4e4ab039c272ad0f01832cec6fc..44a3ff62311ab7d5a99923e006a940a58a4674bb 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 e9036ca985ccef95490e47d6663275934d73d3a7..04c0b319d85dd18ac02af783aa94059d944d15e3 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 0000000000000000000000000000000000000000..d6dbdd730abef250688a5159bf17b2d93e87b8b2
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 0000000000000000000000000000000000000000..a02d96951a146c3d3cc382a3c8da1f45fb072385
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 619f4f400580f4053587905d93d02b789011bf8a..bf19ea5d2335245cb1351fc72c16cb555c0e8ef6 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 8e243310e4ea84fc470e60160923d1c1ff227241..9932f0ba41df7b7c5b0c5202b6454f7f85529d8f 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 fc3a901c5fd1c3726f5ac32fbd39556f829bab2a..081480272ddea0536afd5feeb3267fd98ac73213 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 e7a5f460f27de7ff28f0a72a52bc9bea28a443bc..b245a12a1f5732ab8ca20a48991e163faab21aa3 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 6157663969d52514dec6efd75805b522462cc659..48f0013f148deb68aaa5f74a93f6161bc7174802 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 572238a7011a4526683288f963fbf95afdfccc3b..c73e5d5390458d9223de1acd79f6e6d4cbf1738e 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 cd07cfd4697927841c9604ea94da145c72eb8a01..4377b28a6556316a321fca37adeb32df2e2b90be 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 7bb68e9b7e9f9f430f6f2f1f2fe414182625f078..3c1e1d4657c783c73886371f0187203c703081cf 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 bcc3364524195b554a5bc468f2ba51045f3a278d..c23a3c8da979ffce6b9eac9157858ff3037b7986 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