diff --git a/setup/cli/modules/deploy.php b/setup/cli/modules/deploy.php
index 7eb92514ced75f5c3c25c779b4580ac1b46a96c8..9ddde333f885193258f5d1b4eba1175d8ee1f0e8 100644
--- a/setup/cli/modules/deploy.php
+++ b/setup/cli/modules/deploy.php
@@ -99,7 +99,7 @@ class Deployment extends Unpacker {
         $upgrade = file_exists("{$this->destination}/main.inc.php");
 
         # Get the current value of the INCLUDE_DIR before overwriting
-        # main.inc.php
+        # bootstrap.php
         $include = ($upgrade) ? $this->get_include_dir()
             : ($options['include'] ? $options['include']
                 : rtrim($this->destination, '/')."/include");
diff --git a/setup/cli/package.php b/setup/cli/package.php
index e0b02cdea6725d3a8bd36387ba7e156c0765c32d..10fa537644dde35388e29a488aa19961dbdcf68e 100755
--- a/setup/cli/package.php
+++ b/setup/cli/package.php
@@ -143,9 +143,9 @@ chdir($stage_path);
 shell_exec("sed -ri -e \"
     s/( *)define\('THIS_VERSION'.*/\\1define('THIS_VERSION', '$version');/
     \" upload/bootstrap.php");
-shell_exec("find . -name '*.inc.php' -print0 | xargs -0 sed -ri -e \"
-    s/( *)ini_set\( *'display_errors'[^)]+\);/\\1ini_set('display_errors', 0);/
-    s/( *)ini_set\( *'display_startup_errors'[^)]+\);/\\1ini_set('display_startup_errors', 0);/
+shell_exec("find upload -name '*.php' -print0 | xargs -0 sed -i -e \"
+    s/\( *\)ini_set( *'display_errors'[^])]*);/\\1ini_set('display_errors', 0);/
+    s/\( *\)ini_set( *'display_startup_errors'[^])]*);/\\1ini_set('display_startup_errors', 0);/
     \"");
 
 shell_exec("tar cjf '$pwd/osTicket-$version.tar.bz2' *");