diff --git a/pom.xml b/pom.xml
index ffbfedf7760..cf57b26a5f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,6 +57,7 @@
     <module>check-list</module>
     <module>external-reports</module>
     <module>sonar-java-plugin</module>
+    <module>sonar-java-plugin-zip</module>
     <module>java-surefire</module>
     <module>java-jsp</module>
     <module>its</module>
@@ -82,6 +83,9 @@
   <properties>
     <license.title>SonarQube Java</license.title>
 
+    <!-- DO NOT MERGE: pins to the PR-built two-module ZIP packaging demo, not a released version. -->
+    <version.sonar-packaging.plugin>2.1.0.3083</version.sonar-packaging.plugin>
+
     <jdk.min.version>21</jdk.min.version>
 
     <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
diff --git a/sonar-java-plugin-zip/pom.xml b/sonar-java-plugin-zip/pom.xml
new file mode 100644
index 00000000000..1a760af6615
--- /dev/null
+++ b/sonar-java-plugin-zip/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.sonarsource.java</groupId>
+    <artifactId>java</artifactId>
+    <version>8.46.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>sonar-java-plugin-zip</artifactId>
+  <packaging>sonar-plugin-zip</packaging>
+
+  <name>SonarQube Java :: Plugin :: Zip</name>
+  <description>Wraps the sonar-java-plugin JAR into a ZIP-packaged plugin artifact</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>sonar-java-plugin</artifactId>
+      <version>${project.version}</version>
+      <type>sonar-plugin</type>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/sonar-java-plugin/src/main/resources/static/documentation.md b/sonar-java-plugin-zip/src/main/resources/documentation.md
similarity index 100%
rename from sonar-java-plugin/src/main/resources/static/documentation.md
rename to sonar-java-plugin-zip/src/main/resources/documentation.md