diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index 8a0dd161850..ca7759249c6 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -366,7 +366,7 @@
           <descriptors>
             <descriptor>src/main/assembly/jetty-assembly.xml</descriptor>
           </descriptors>
-          <tarLongFileMode>gnu</tarLongFileMode>
+          <tarLongFileMode>posix</tarLongFileMode>
           <appendAssemblyId>false</appendAssemblyId>
         </configuration>
         <executions>
diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/quickstart-webapp.adoc b/jetty-documentation/src/main/asciidoc/configuring/deploying/quickstart-webapp.adoc
index 2ee31eed56b..a6af6cbda76 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/deploying/quickstart-webapp.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/deploying/quickstart-webapp.adoc
@@ -79,6 +79,10 @@ generateOrigin::
                     If true, the origin attribute will be inserted into each element in quickstart-web.xml.
                     Note that origin attributes will also be generated if debug log level is enabled.
 
+____
+[NOTE]
+If you are using Spring-Boot you must set `generateOrigin` to true.
+____
 
 The origin is either a descriptor eg web.xml,web-fragment.xml,override-web.xml file, or an annotation eg @WebServlet.
 For xml validation each attribute must be unique, and therefore an integer counter is appended to each value.
diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml
index 9336b627007..cf8a5d11a9d 100644
--- a/jetty-home/pom.xml
+++ b/jetty-home/pom.xml
@@ -324,7 +324,7 @@
           <descriptors>
             <descriptor>src/main/assembly/jetty-assembly.xml</descriptor>
           </descriptors>
-          <tarLongFileMode>gnu</tarLongFileMode>
+          <tarLongFileMode>posix</tarLongFileMode>
           <appendAssemblyId>false</appendAssemblyId>
         </configuration>
         <executions>
diff --git a/pom.xml b/pom.xml
index f6c6b1dc292..1be55c3da85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -373,7 +373,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
-          <version>3.0.0</version>
+          <version>3.1.0</version>
           <dependencies>
             <dependency>
               <groupId>org.eclipse.jetty.toolchain</groupId>