diff --git a/pom.xml b/pom.xml
index d5a7529b133..58667c8c7c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -294,7 +294,7 @@
         <plugin>
           <groupId>org.eclipse.jetty.toolchain</groupId>
           <artifactId>jetty-version-maven-plugin</artifactId>
-          <version>2.3</version>
+          <version>2.5</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -773,12 +773,27 @@
                 <phase>generate-resources</phase>
                 <goals>
                   <goal>update-version-text</goal>
+                  <goal>tag</goal>
                 </goals>
                 <configuration>
                   <refreshTags>true</refreshTags>
                   <copyGenerated>true</copyGenerated>
                   <attachArtifact>false</attachArtifact>
                   <updateDate>true</updateDate>
+                  <versionTagHeader>Tag for release: jetty-${project.version}</versionTagHeader>
+                  <filenameExcludes>
+                    <filenameExclude>jetty-documentation/.*</filenameExclude>
+                    <filenameExclude>examples/.*</filenameExclude>
+                    <filenameExclude>aggregates/.*</filenameExclude>
+                    <filenameExclude>.*/test-.*</filenameExclude>
+                    <filenameExclude>.*/.*-test/.*</filenameExclude>
+                    <filenameExclude>.*/.*-tests/.*</filenameExclude>
+                    <filenameExclude>.*/src/test/.*</filenameExclude>
+                    <filenameExclude>\.git.*</filenameExclude>
+                    <filenameExclude>.*\.md$</filenameExclude>
+                    <filenameExclude>.*\.txt$</filenameExclude>
+                    <filenameExclude>Jenkinsfile</filenameExclude>
+                  </filenameExcludes>
                 </configuration>
               </execution>
             </executions>