diff --git a/jetty-server/src/main/config/etc/jetty-ssl-context.xml b/jetty-server/src/main/config/etc/jetty-ssl-context.xml
index 32bf555d369..0c8c739c90b 100644
--- a/jetty-server/src/main/config/etc/jetty-ssl-context.xml
+++ b/jetty-server/src/main/config/etc/jetty-ssl-context.xml
@@ -5,12 +5,24 @@
     <Arg>
       <New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory$Server">
         <Set name="Provider" property="jetty.sslContext.provider" />
-        <Set name="KeyStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslContext.keyStorePath" default="etc/keystore.p12" /></Set>
+        <Set name="KeyStorePath">
+          <Property name="jetty.sslContext.keyStoreAbsolutePath">
+            <Default>
+              <Property name="jetty.base" default="." />/<Property name="jetty.sslContext.keyStorePath" deprecated="jetty.keystore" default="etc/keystore"/>
+            </Default>
+          </Property>
+        </Set>
         <Set name="KeyStorePassword"><Property name="jetty.sslContext.keyStorePassword" /></Set>
         <Set name="KeyStoreType" property="jetty.sslContext.keyStoreType" />
         <Set name="KeyStoreProvider" property="jetty.sslContext.keyStoreProvider" />
         <Set name="KeyManagerPassword"><Property name="jetty.sslContext.keyManagerPassword" /></Set>
-        <Set name="TrustStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslContext.trustStorePath" default="etc/keystore.p12" /></Set>
+        <Set name="TrustStorePath">
+          <Property name="jetty.sslContext.trustStoreAbsolutePath">
+            <Default>
+              <Property name="jetty.base" default="." />/<Property name="jetty.sslContext.trustStorePath" deprecated="jetty.truststore" default="etc/keystore"/>
+            </Default>
+          </Property>
+        </Set>
         <Set name="TrustStorePassword" property="jetty.sslContext.trustStorePassword" />
         <Set name="TrustStoreType" property="jetty.sslContext.trustStoreType" />
         <Set name="TrustStoreProvider" property="jetty.sslContext.trustStoreProvider" />
diff --git a/jetty-server/src/main/config/modules/ssl.mod b/jetty-server/src/main/config/modules/ssl.mod
index 66340a195b5..78b2dd4548c 100644
--- a/jetty-server/src/main/config/modules/ssl.mod
+++ b/jetty-server/src/main/config/modules/ssl.mod
@@ -85,9 +85,13 @@ etc/jetty-ssl-context.xml
 
 ## The KeyStore file path (relative to $JETTY_BASE).
 # jetty.sslContext.keyStorePath=etc/keystore.p12
+## The KeyStore absolute file path.
+# jetty.sslContext.keyStoreAbsolutePath=${jetty.base}/etc/keystore.p12
 
 ## The TrustStore file path (relative to $JETTY_BASE).
 # jetty.sslContext.trustStorePath=etc/keystore.p12
+## The TrustStore absolute file path.
+# jetty.sslContext.trustStoreAbsolutePath=${jetty.base}/etc/keystore.p12
 
 ## The KeyStore password.
 # jetty.sslContext.keyStorePassword=