diff --git a/build.xml b/build.xml
index 0e9c42bf19..4b95d93a8a 100644
--- a/build.xml
+++ b/build.xml
@@ -55,7 +55,7 @@
    <arg line="${source_comma_sep}
               xml
               codesize,design,naming,unusedcode
-              --exclude test,build,tcpdf,php-gettext,bfShapeFiles,PMAStandard,phpseclib,recaptchalib.php,swekey.php,vendor,sql-formatter
+              --exclude test,build,tcpdf,php-gettext,bfShapeFiles,PMAStandard,phpseclib,recaptchalib.php,swekey.php,vendor,sql-parser
               --reportfile '${basedir}/build/logs/pmd.xml'" />
   </exec>
  </target>
@@ -71,9 +71,9 @@
               --exclude libraries/php-gettext
               --exclude libraries/bfShapeFiles
               --exclude libraries/phpseclib
-              --exclude libraries/plugins/auth/recaptchalib.php
+              --exclude libraries/plugins/auth/recaptcha/recaptchalib.php
               --exclude libraries/plugins/auth/swekey/swekey.php
-              --exclude libraries/sql-formatter/
+              --exclude libraries/sql-parser
               ${source}" />
   </exec>
  </target>
@@ -89,9 +89,9 @@
               --exclude libraries/php-gettext
               --exclude libraries/bfShapeFiles
               --exclude libraries/phpseclib
-              --exclude libraries/plugins/auth/recaptchalib.php
+              --exclude libraries/plugins/auth/recaptcha/recaptchalib.php
               --exclude libraries/plugins/auth/swekey/swekey.php
-              --exclude libraries/sql-formatter/
+              --exclude libraries/sql-parser
               ${source}" />
   </exec>
  </target>
@@ -99,7 +99,7 @@
  <target name="phpcs" description="Generate checkstyle.xml using PHP_CodeSniffer excluding third party libraries">
   <exec executable="phpcs">
    <arg line="
-              --ignore=*/php-gettext/*,*/vendor/*,*/tcpdf/*,*/canvg/*,*/codemirror/*,*/openlayers/*,*/jquery/*,*/jqplot/*,*/build/*,*/bfShapeFiles/*,*/PMAStandard/*,*/phpseclib/*,*/recaptcha/*,*/swekey/*,*/sql-formatter/*,*/sql-parser/*
+              --ignore=*/php-gettext/*,*/vendor/*,*/tcpdf/*,*/canvg/*,*/codemirror/*,*/openlayers/*,*/jquery/*,*/jqplot/*,*/build/*,*/bfShapeFiles/*,*/PMAStandard/*,*/phpseclib/*,*/recaptcha/*,*/swekey/*,*/sql-parser/*
               --report=checkstyle
               --extensions=php
               --report-file='${basedir}/build/logs/checkstyle.xml'