diff --git a/cli/pom.xml b/cli/pom.xml
index 03e33230f50..67fe720840c 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -96,12 +96,36 @@ Copyright (c) 2012 - Jeremy Long. All Rights Reserved.
                 <executions>
                     <execution>
                         <id>assemble</id>
+                        <phase>package</phase>
                         <goals>
                             <goal>assemble</goal>
                         </goals>
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>fix-windows-shell-script</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Hack/workaround for https://github.com/mojohaus/appassembler/issues/114 -->
+                            <target>
+                                <replace file="${project.build.directory}/release/bin/dependency-check.bat"
+                                         token="%JAVACMD% %JAVA_OPTS%"
+                                         value="&quot;%JAVACMD%&quot; %JAVA_OPTS%"
+                                         failOnNoReplacements="true"
+                                />
+                            </target>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>