diff --git a/pmd-cli/pom.xml b/pmd-cli/pom.xml
index fc2a623d9f..25fa8e82e9 100644
--- a/pmd-cli/pom.xml
+++ b/pmd-cli/pom.xml
@@ -44,7 +44,7 @@
                   <argument>--force</argument>
                   <argument>--completionScript</argument>
                   <argument>${project.build.directory}/pmd_completion.sh</argument>
-                  <argument>net.sourceforge.pmd.cli.internal.commands.PMDRootCommand</argument>
+                  <argument>net.sourceforge.pmd.cli.commands.internal.PMDRootCommand</argument>
                 </arguments>
               </configuration>
             </plugin>
diff --git a/pmd-core/pom.xml b/pmd-core/pom.xml
index 7ce81c2c40..08e5e4daaa 100644
--- a/pmd-core/pom.xml
+++ b/pmd-core/pom.xml
@@ -51,34 +51,6 @@
                     </execution>
                 </executions>
             </plugin>
-
-            <!-- TODO: Move this to pmd-dist, and have all modules in the classpath so language autocompletion works as expected -->
-            <plugin>
-              <groupId>org.codehaus.mojo</groupId>
-              <artifactId>exec-maven-plugin</artifactId>
-              <executions>
-                <execution>
-                  <id>generate-autocompletion-script</id>
-                  <phase>package</phase>
-                  <goals>
-                    <goal>exec</goal>
-                  </goals>
-                </execution>
-              </executions>
-              <configuration>
-                <executable>java</executable>
-                <arguments>
-                  <argument>-Dpicocli.autocomplete.systemExitOnError</argument>
-                  <argument>-cp</argument>
-                  <classpath/>
-                  <argument>picocli.AutoComplete</argument>
-                  <argument>--force</argument>
-                  <argument>--completionScript</argument>
-                  <argument>${project.build.directory}/pmd_completion.sh</argument>
-                  <argument>net.sourceforge.pmd.cli.internal.commands.PMDRootCommand</argument>
-                </arguments>
-              </configuration>
-            </plugin>
         </plugins>
     </build>
     <dependencies>