diff --git a/cmdline/build.xml b/cmdline/build.xml
index 848ad18..fd80860 100644
--- a/cmdline/build.xml
+++ b/cmdline/build.xml
@@ -44,7 +44,7 @@
 
     <target name="build-source-dist">
         <mkdir dir="build" />
-        <zip file="build/incubating-apache-netbeans-jackpot-${version}.zip">
+        <zip file="build/apache-netbeans-jackpot-${version}.zip">
             <zipfileset dir="." excludes="**/build/" prefix="jackpot"/>
             <zipfileset dir=".." includes="LICENSE" fullpath="jackpot/LICENSE"/>
             <zipfileset dir=".." includes="NOTICE" fullpath="jackpot/NOTICE"/>
@@ -81,7 +81,7 @@
         </exec>
         <echo>Installing tool to the local maven repository:</echo>
         <exec dir="." executable="mvn" failonerror="true">
-            <arg line="install:install-file -Dfile=tool/build/jackpot/jackpot.jar -DgroupId=org.apache.netbeans.modules.jackpot30 -DartifactId=tool -Dversion=${version} -Dpackaging=jar -DgeneratePom=true" />
+            <arg line="install:install-file -Dfile=tool/build/jackpot/jackpot.jar -DgroupId=org.apache.netbeans.modules.jackpot30 -DartifactId=tool -Dversion=${version} -Dpackaging=jar -DpomFile=tool/scripts/pom.xml" />
         </exec>
         <echo>Building maven plugin:</echo>
         <exec dir="maven" executable="mvn" failonerror="true">
@@ -96,7 +96,7 @@
         <mkdir dir="${build.maven.repo}" />
         <echo>Installing tool to the target maven repository:</echo>
         <exec dir="maven" executable="mvn" failonerror="true">
-            <arg line="deploy:deploy-file -Dfile=${basedir}/tool/build/jackpot/jackpot.jar -DgroupId=org.apache.netbeans.modules.jackpot30 -DartifactId=tool -Dversion=${version} -Dpackaging=jar -DgeneratePom=true -DaltDeploymentRepository=temp::default::file://${build.maven.repo} -Durl=file://${build.maven.repo}" />
+            <arg line="deploy:deploy-file -Dfile=${basedir}/tool/build/jackpot/jackpot.jar -Djavadoc=${basedir}/tool/build/jackpot-javadoc.zip -Dsources=${basedir}/tool/build/jackpot-sources.zip -DgroupId=org.apache.netbeans.modules.jackpot30 -DartifactId=tool -Dversion=${version} -Dpackaging=jar -DgeneratePom=true -DaltDeploymentRepository=temp::default::file://${build.maven.repo} -Durl=file://${build.maven.repo}" />
         </exec>
         <echo>Installing plugin to the target maven repository:</echo>
         <exec dir="maven" executable="mvn" failonerror="true">
diff --git a/cmdline/maven/pom.xml b/cmdline/maven/pom.xml
index 4a29e9e..aa9182b 100644
--- a/cmdline/maven/pom.xml
+++ b/cmdline/maven/pom.xml
@@ -30,7 +30,13 @@
     <artifactId>netbeans-parent</artifactId>
     <version>2</version>
   </parent>
-  <url>https://bitbucket.org/jlahoda/jackpot30/overview</url>
+  <url>https://netbeans.apache.org</url>
+  <scm>
+      <connection>scm:git:https://gitbox.apache.org/repos/asf/netbeans-jackpot30.git</connection>
+      <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/netbeans-jackpot30.git</developerConnection>
+      <url>https://github.com/apache/netbeans-jackpot30/tree/${project.scm.tag}</url>
+      <tag>master</tag>
+  </scm>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/cmdline/tool/build.xml b/cmdline/tool/build.xml
index 495b225..8edafd5 100644
--- a/cmdline/tool/build.xml
+++ b/cmdline/tool/build.xml
@@ -44,7 +44,6 @@
         <jar update="true" destfile="${build.classes.dir}/../jackpot/jackpot.jar">
             <zipfileset dir="scripts" includes="LICENSE-bin-tool.txt" fullpath="META-INF/LICENSE" />
             <zipfileset dir="scripts" includes="NOTICE-bin-tool.txt" fullpath="META-INF/NOTICE" />
-            <zipfileset dir="${jackpot.root}" includes="DISCLAIMER" fullpath="META-INF/DISCLAIMER" />
         </jar>
         <ant target="jar" inheritall="false" inheritrefs="false" dir="../ant">
             <property name="var.nbplatform.default.netbeans.dest.dir" location="${nbplatform.default.netbeans.dest.dir}" />
@@ -61,6 +60,17 @@
                 <exclude name="jackpot" />
             </zipfileset>
         </zip>
+        <zip destfile="${build.classes.dir}/../jackpot-sources.zip">
+            <zipfileset dir="src"/>
+            <zipfileset dir="${jackpot.root}" includes="LICENSE" fullpath="META-INF/LICENSE" />
+            <zipfileset dir="${jackpot.root}" includes="NOTICE" fullpath="META-INF/NOTICE" />
+        </zip>
+        <echo file="${build.classes.dir}/../README-javadoc.md">This jar does not have any API.</echo>
+        <zip destfile="${build.classes.dir}/../jackpot-javadoc.zip">
+            <zipfileset file="${build.classes.dir}/../README-javadoc.md"/>
+            <zipfileset dir="${jackpot.root}" includes="LICENSE" fullpath="META-INF/LICENSE" />
+            <zipfileset dir="${jackpot.root}" includes="NOTICE" fullpath="META-INF/NOTICE" />
+        </zip>
     </target>
     
     <target name="test-build" depends="projectized-common.test-build,-prepare-scripted-tests" />
diff --git a/cmdline/tool/scripts/pom.xml b/cmdline/tool/scripts/pom.xml
new file mode 100644
index 0000000..d4d329b
--- /dev/null
+++ b/cmdline/tool/scripts/pom.xml
@@ -0,0 +1,46 @@
+<!--
+
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.netbeans.modules.jackpot30</groupId>
+  <artifactId>jackpot30-maven-plugin</artifactId>
+  <version>11.1</version>
+  <packaging>maven-plugin</packaging>
+
+  <name>Jackpot 3.0 Command Line Tool</name>
+  <parent>
+    <groupId>org.apache.netbeans</groupId>
+    <artifactId>netbeans-parent</artifactId>
+    <version>2</version>
+  </parent>
+  <url>https://netbeans.apache.org</url>
+  <scm>
+      <connection>scm:git:https://gitbox.apache.org/repos/asf/netbeans-jackpot30.git</connection>
+      <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/netbeans-jackpot30.git</developerConnection>
+      <url>https://github.com/apache/netbeans-jackpot30/tree/${project.scm.tag}</url>
+      <tag>master</tag>
+  </scm>
+
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+</project>
diff --git a/cmdline/tool/test/unit/src/org/netbeans/modules/jackpot30/cmdline/MainTest.java b/cmdline/tool/test/unit/src/org/netbeans/modules/jackpot30/cmdline/MainTest.java
index f5b7056..5be9315 100644
--- a/cmdline/tool/test/unit/src/org/netbeans/modules/jackpot30/cmdline/MainTest.java
+++ b/cmdline/tool/test/unit/src/org/netbeans/modules/jackpot30/cmdline/MainTest.java
@@ -888,6 +888,35 @@
                       "@" + getWorkDirPath() + "/parameters.txt");
     }
 
+    public void testParameterFileWithGroup() throws Exception {
+        String golden =
+            "package test;\n" +
+            "public class Test {\n" +
+            "    private void test(java.util.Collection c) {\n" +
+            "        boolean b = c.isEmpty();\n" +
+            "    }\n" +
+            "}\n";
+
+        doRunCompiler(golden,
+                      null,
+                      null,
+                      "src/test/Test.java",
+                      "package test;\n" +
+                      "public class Test {\n" +
+                      "    private void test(java.util.Collection c) {\n" +
+                      "        boolean b = c.size() == 0;\n" +
+                      "    }\n" +
+                      "}\n",
+                      "parameters.txt",
+                      "--apply\n" +
+                      "--group\n" +
+                      "--source 8 --sourcepath ${workdir}/src\n" +
+                      "--hint\n" +
+                      "Usage of .size() == 0\n",
+                      null,
+                      "@" + getWorkDirPath() + "/parameters.txt");
+    }
+
     private static final String DONT_APPEND_PATH = new String("DONT_APPEND_PATH");
     private static final String IGNORE = new String("IGNORE");