diff --git a/pmd/etc/generate_release.sh b/pmd/etc/generate_release.sh
index b9c5f83003..f66e0a671b 100644
--- a/pmd/etc/generate_release.sh
+++ b/pmd/etc/generate_release.sh
@@ -71,41 +71,35 @@ echo "Rebuilding everything"
 echo
 
 set -e
+
 cd ..
 ant -f bin/build.xml dist
 status="${?}"
-
 if [ ${status} -ne 0 ]; then
     echo "build failed - aborting release"
     exit 2
 fi
+cd etc
 
 if [ -z ${no_docs} ]; then
+    cd ../
     ./docs.sh all
+    cd etc
 else
     echo "no documentation generation"
 fi
 
-cd etc
-
-echo
 echo "generating binary file ${pmd_top_dir}/pmd-bin-${version}.zip"
-echo
 
 rm -rf "${pmd_bin_dir}"
 rm -f "${pmd_top_dir}/pmd-bin-${version}.zip"
 mkdir -p "${pmd_bin_dir}/etc"
 mkdir "${pmd_bin_dir}/bin"
 mkdir "${pmd_bin_dir}/lib"
-mkdir -p "${pmd_bin_dir}/java14/lib"
-mkdir "${pmd_bin_dir}/java14/bin"
 cp ../LICENSE.txt changelog.txt "${pmd_bin_dir}/etc"
 cd ../bin/
 cp pmd.* build.xml cpd.sh cpdgui.bat designer.* "${pmd_bin_dir}/bin"
 cd ../etc/
-cp ../java14/lib/*.jar "${pmd_bin_dir}/java14/lib/"
-cp ../java14/bin/cpd* ../java14/bin/pmd.* ../java14/bin/designer.* "${pmd_bin_dir}/java14/bin/"
-chmod 755 "${pmd_bin_dir}/java14/bin/*"
 cp ../lib/pmd-$version.jar ../lib/asm-3.2.jar ../lib/jaxen-1.1.1.jar ../lib/junit-4.4.jar "${pmd_bin_dir}/lib/"
 mkdir "${pmd_bin_dir}/etc/xslt"
 cp xslt/*.xslt xslt/*.js xslt/*.gif xslt/*.css "${pmd_bin_dir}/etc/xslt/"