diff --git a/UPDATING b/UPDATING
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,17 @@
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20251016:
+  AFFECTS: users of sysutils/javaservicewrapper
+  AUTHOR: michaelo@FreeBSD.org
+
+  With the upgrade to version 3.6.0+ support for all properties ending with
+  '.stripquotes' in your wrapper.conf has been dropped and your application
+  won't start again.
+
+  Read the release notes for more details:
+  https://wrapper.tanukisoftware.com/doc/english/release-notes.html#3.6.0
+
 20251015:
   AFFECTS: users of security/libressl
   AUTHOR: brnrd@FreeBSD.org
diff --git a/sysutils/javaservicewrapper/Makefile b/sysutils/javaservicewrapper/Makefile
--- a/sysutils/javaservicewrapper/Makefile
+++ b/sysutils/javaservicewrapper/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	javaservicewrapper
-PORTVERSION=	3.5.60
+PORTVERSION=	3.6.3
 CATEGORIES=	sysutils java
 MASTER_SITES=	https://wrapper.tanukisoftware.com/download/${PORTVERSION}/
 DISTNAME=	wrapper_${PORTVERSION}_src
diff --git a/sysutils/javaservicewrapper/distinfo b/sysutils/javaservicewrapper/distinfo
--- a/sysutils/javaservicewrapper/distinfo
+++ b/sysutils/javaservicewrapper/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742215176
-SHA256 (wrapper_3.5.60_src.tar.gz) = 877896e14f375c0c881c3a50f8ee910bc6504b388fbbfe65128e79d763d08717
-SIZE (wrapper_3.5.60_src.tar.gz) = 831764
+TIMESTAMP = 1760527269
+SHA256 (wrapper_3.6.3_src.tar.gz) = 7bc5ad89ed21a39b4a4ed548dfe92fc587aed40e6c75059a71309fb8042ff580
+SIZE (wrapper_3.6.3_src.tar.gz) = 902583
diff --git a/sysutils/javaservicewrapper/pkg-message b/sysutils/javaservicewrapper/pkg-message
new file mode 100644
--- /dev/null
+++ b/sysutils/javaservicewrapper/pkg-message
@@ -0,0 +1,14 @@
+[
+{
+  type: upgrade
+  maximum_version: "3.6.0"
+  message: <<EOM
+With the upgrade to version 3.6.0+ support for all properties ending with
+'.stripquotes' in your wrapper.conf has been dropped and your application
+won't start again.
+
+Read the release notes for more details:
+https://wrapper.tanukisoftware.com/doc/english/release-notes.html#3.6.0
+EOM
+}
+]
diff --git a/sysutils/javaservicewrapper/pkg-plist b/sysutils/javaservicewrapper/pkg-plist
--- a/sysutils/javaservicewrapper/pkg-plist
+++ b/sysutils/javaservicewrapper/pkg-plist
@@ -9,27 +9,64 @@
 %%DATADIR%%/lib/wrapperdemo.jar
 %%DATADIR%%/lib/wrappertest.jar
 %%DATADIR%%/lib/wrappertest2.jar
+%%DATADIR%%/test/additionalproperties
+%%DATADIR%%/test/additionalproperties.conf
 %%DATADIR%%/test/appparameterfile-01-empty
 %%DATADIR%%/test/appparameterfile-01-empty.conf
 %%DATADIR%%/test/appparameterfile-01-empty.param
 %%DATADIR%%/test/appparameterfile-02-1line
 %%DATADIR%%/test/appparameterfile-02-1line.conf
 %%DATADIR%%/test/appparameterfile-02-1line.param
-%%DATADIR%%/test/appparameterfile-03-stripq-false
-%%DATADIR%%/test/appparameterfile-03-stripq-false.conf
-%%DATADIR%%/test/appparameterfile-03-stripq-false.param
-%%DATADIR%%/test/appparameterfile-04-stripq-true
-%%DATADIR%%/test/appparameterfile-04-stripq-true.conf
-%%DATADIR%%/test/appparameterfile-04-stripq-true.param
+%%DATADIR%%/test/appparameterfile-03-quotable-false
+%%DATADIR%%/test/appparameterfile-03-quotable-false.conf
+%%DATADIR%%/test/appparameterfile-03-quotable-false.param
+%%DATADIR%%/test/appparameterfile-04-quotable-true
+%%DATADIR%%/test/appparameterfile-04-quotable-true.conf
+%%DATADIR%%/test/appparameterfile-04-quotable-true.param
 %%DATADIR%%/test/appparameterfile-05-encoding
 %%DATADIR%%/test/appparameterfile-05-encoding.conf
 %%DATADIR%%/test/appparameterfile-05-encoding.param
-%%DATADIR%%/test/appparameterfile-06-multilines
-%%DATADIR%%/test/appparameterfile-06-multilines.conf
-%%DATADIR%%/test/appparameterfile-06-multilines.param
-%%DATADIR%%/test/appparameterfile-07-envvars
-%%DATADIR%%/test/appparameterfile-07-envvars.conf
-%%DATADIR%%/test/appparameterfile-07-envvars.param
+%%DATADIR%%/test/appparameterfile-06-multilines-quotable-false
+%%DATADIR%%/test/appparameterfile-06-multilines-quotable-false.conf
+%%DATADIR%%/test/appparameterfile-06-multilines-quotable-false.param
+%%DATADIR%%/test/appparameterfile-07-multilines-quotable-true
+%%DATADIR%%/test/appparameterfile-07-multilines-quotable-true.conf
+%%DATADIR%%/test/appparameterfile-07-multilines-quotable-true.param
+%%DATADIR%%/test/appparameterfile-08-envvars
+%%DATADIR%%/test/appparameterfile-08-envvars.conf
+%%DATADIR%%/test/appparameterfile-08-envvars.param
+%%DATADIR%%/test/appproperties
+%%DATADIR%%/test/appproperties.conf
+%%DATADIR%%/test/apppropertyfile-01-empty
+%%DATADIR%%/test/apppropertyfile-01-empty.conf
+%%DATADIR%%/test/apppropertyfile-01-empty.param
+%%DATADIR%%/test/apppropertyfile-02-1line
+%%DATADIR%%/test/apppropertyfile-02-1line.conf
+%%DATADIR%%/test/apppropertyfile-02-1line.param
+%%DATADIR%%/test/apppropertyfile-03-quotable-false
+%%DATADIR%%/test/apppropertyfile-03-quotable-false.conf
+%%DATADIR%%/test/apppropertyfile-03-quotable-false.param
+%%DATADIR%%/test/apppropertyfile-04-quotable-true
+%%DATADIR%%/test/apppropertyfile-04-quotable-true.conf
+%%DATADIR%%/test/apppropertyfile-04-quotable-true.param
+%%DATADIR%%/test/apppropertyfile-05-encoding
+%%DATADIR%%/test/apppropertyfile-05-encoding.conf
+%%DATADIR%%/test/apppropertyfile-05-encoding.param
+%%DATADIR%%/test/apppropertyfile-06-multilines-quotable-false
+%%DATADIR%%/test/apppropertyfile-06-multilines-quotable-false.conf
+%%DATADIR%%/test/apppropertyfile-06-multilines-quotable-false.param
+%%DATADIR%%/test/apppropertyfile-07-multilines-quotable-true
+%%DATADIR%%/test/apppropertyfile-07-multilines-quotable-true.conf
+%%DATADIR%%/test/apppropertyfile-07-multilines-quotable-true.param
+%%DATADIR%%/test/apppropertyfile-08-envvars
+%%DATADIR%%/test/apppropertyfile-08-envvars.conf
+%%DATADIR%%/test/apppropertyfile-08-envvars.param
+%%DATADIR%%/test/backendparamslistener
+%%DATADIR%%/test/backendparamslistener.conf
+%%DATADIR%%/test/backendparamssimple
+%%DATADIR%%/test/backendparamssimple.conf
+%%DATADIR%%/test/backendparamsstartstop
+%%DATADIR%%/test/backendparamsstartstop.conf
 %%DATADIR%%/test/backgroundthreads
 %%DATADIR%%/test/backgroundthreads.conf
 %%DATADIR%%/test/childwrapper
@@ -39,12 +76,6 @@
 %%DATADIR%%/test/common/resourcelimit
 %%DATADIR%%/test/daemonthreads
 %%DATADIR%%/test/daemonthreads.conf
-%%DATADIR%%/test/defaultstripquotes-01-none
-%%DATADIR%%/test/defaultstripquotes-01-none.conf
-%%DATADIR%%/test/defaultstripquotes-02-true
-%%DATADIR%%/test/defaultstripquotes-02-true.conf
-%%DATADIR%%/test/defaultstripquotes-03-false
-%%DATADIR%%/test/defaultstripquotes-03-false.conf
 %%DATADIR%%/test/delayediorestarter
 %%DATADIR%%/test/delayediorestarter.conf
 %%DATADIR%%/test/envvars
@@ -77,21 +108,36 @@
 %%DATADIR%%/test/javaadditionalfile-02-1line
 %%DATADIR%%/test/javaadditionalfile-02-1line.conf
 %%DATADIR%%/test/javaadditionalfile-02-1line.param
-%%DATADIR%%/test/javaadditionalfile-03-stripq-false
-%%DATADIR%%/test/javaadditionalfile-03-stripq-false.conf
-%%DATADIR%%/test/javaadditionalfile-03-stripq-false.param
-%%DATADIR%%/test/javaadditionalfile-04-stripq-true
-%%DATADIR%%/test/javaadditionalfile-04-stripq-true.conf
-%%DATADIR%%/test/javaadditionalfile-04-stripq-true.param
+%%DATADIR%%/test/javaadditionalfile-03-quotable-false
+%%DATADIR%%/test/javaadditionalfile-03-quotable-false.conf
+%%DATADIR%%/test/javaadditionalfile-03-quotable-false.param
+%%DATADIR%%/test/javaadditionalfile-04-quotable-true
+%%DATADIR%%/test/javaadditionalfile-04-quotable-true.conf
+%%DATADIR%%/test/javaadditionalfile-04-quotable-true.param
 %%DATADIR%%/test/javaadditionalfile-05-encoding
 %%DATADIR%%/test/javaadditionalfile-05-encoding.conf
 %%DATADIR%%/test/javaadditionalfile-05-encoding.param
-%%DATADIR%%/test/javaadditionalfile-06-multilines
-%%DATADIR%%/test/javaadditionalfile-06-multilines.conf
-%%DATADIR%%/test/javaadditionalfile-06-multilines.param
-%%DATADIR%%/test/javaadditionalfile-07-envvars
-%%DATADIR%%/test/javaadditionalfile-07-envvars.conf
-%%DATADIR%%/test/javaadditionalfile-07-envvars.param
+%%DATADIR%%/test/javaadditionalfile-06-multilines-quotable-false
+%%DATADIR%%/test/javaadditionalfile-06-multilines-quotable-false.conf
+%%DATADIR%%/test/javaadditionalfile-06-multilines-quotable-false.param
+%%DATADIR%%/test/javaadditionalfile-07-multilines-quotable-true
+%%DATADIR%%/test/javaadditionalfile-07-multilines-quotable-true.conf
+%%DATADIR%%/test/javaadditionalfile-07-multilines-quotable-true.param
+%%DATADIR%%/test/javaadditionalfile-08-envvars
+%%DATADIR%%/test/javaadditionalfile-08-envvars.conf
+%%DATADIR%%/test/javaadditionalfile-08-envvars.param
+%%DATADIR%%/test/javaadditionalscope-01-conf
+%%DATADIR%%/test/javaadditionalscope-01-conf.conf
+%%DATADIR%%/test/javaadditionalscope-02-file
+%%DATADIR%%/test/javaadditionalscope-02-file.conf
+%%DATADIR%%/test/javaadditionalscope-02-filequotableFALSE.param
+%%DATADIR%%/test/javaadditionalscope-02-filequotableTRUE.param
+%%DATADIR%%/test/javaadditionalsplit-01-conf
+%%DATADIR%%/test/javaadditionalsplit-01-conf.conf
+%%DATADIR%%/test/javaadditionalsplit-02-file
+%%DATADIR%%/test/javaadditionalsplit-02-file.conf
+%%DATADIR%%/test/javaadditionalsplit-02-filequotableFALSE.param
+%%DATADIR%%/test/javaadditionalsplit-02-filequotableTRUE.param
 %%DATADIR%%/test/jvmencoding
 %%DATADIR%%/test/jvmencoding.conf
 %%DATADIR%%/test/jvmencoding2
@@ -118,6 +164,8 @@
 %%DATADIR%%/test/longrunningwithshutdownhook.conf
 %%DATADIR%%/test/memory
 %%DATADIR%%/test/memory.conf
+%%DATADIR%%/test/module-nativeaccess
+%%DATADIR%%/test/module-nativeaccess.conf
 %%DATADIR%%/test/module-standalone-jarapp
 %%DATADIR%%/test/module-standalone-jarapp-runtimeimage
 %%DATADIR%%/test/module-standalone-jarapp-runtimeimage.conf
@@ -152,6 +200,8 @@
 %%DATADIR%%/test/onexit.conf
 %%DATADIR%%/test/outputloader
 %%DATADIR%%/test/outputloader.conf
+%%DATADIR%%/test/parameters
+%%DATADIR%%/test/parameters.conf
 %%DATADIR%%/test/passthrough
 %%DATADIR%%/test/passthrough.conf
 %%DATADIR%%/test/percentoutput
@@ -177,6 +227,8 @@
 %%DATADIR%%/test/shutdownlock.conf
 %%DATADIR%%/test/simplewrapperlistener
 %%DATADIR%%/test/simplewrapperlistener.conf
+%%DATADIR%%/test/slowclassinit
+%%DATADIR%%/test/slowclassinit.conf
 %%DATADIR%%/test/slowstop
 %%DATADIR%%/test/slowstop.conf
 %%DATADIR%%/test/startstopstopandreturnwhilestarting
@@ -187,8 +239,6 @@
 %%DATADIR%%/test/stopwhilestarting.conf
 %%DATADIR%%/test/stopwhilestartingforcestop
 %%DATADIR%%/test/stopwhilestartingforcestop.conf
-%%DATADIR%%/test/systemproperty
-%%DATADIR%%/test/systemproperty.conf
 %%DATADIR%%/test/template.conf
 %%DATADIR%%/test/template-module.conf
 %%DATADIR%%/test/timedlogoutput