diff --git a/bin/icingacli b/bin/icingacli
index 1a0781222..5bd5086d2 100755
--- a/bin/icingacli
+++ b/bin/icingacli
@@ -1,6 +1,17 @@
 #!/usr/bin/php
-<?php
 
-use Icinga\Application\Cli;
-require_once dirname(__DIR__) . '/library/Icinga/Application/Cli.php';
-Cli::start()->dispatch();
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+define('ICINGAWEB_BASEDIR', dirname(__DIR__));
+// ICINGAWEB_BASEDIR is the parent folder for at least application, bin, modules, library/vendor and public
+
+
+if (! @include_once ICINGAWEB_BASEDIR . 'Icinga/Application/Cli.php') {
+    // If the Icinga library wasn't found under ICINGAWEB_BASEDIR, require that the Icinga library is found in PHP's
+    // include path which is the case if Icinga Web 2 is installed via packages
+    require_once 'Icinga/Application/Cli.php';
+}
+
+Icinga\Application\Cli::start()->dispatch();
diff --git a/public/index.php b/public/index.php
index 92cd0a499..881c1318e 100644
--- a/public/index.php
+++ b/public/index.php
@@ -3,7 +3,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 
 define('ICINGAWEB_BASEDIR', dirname(__DIR__));
-// ICINGAWEB_BASEDIR is the parent folder for at least application, bin, modules and public
+// ICINGAWEB_BASEDIR is the parent folder for at least application, bin, modules, library/vendor and public
 
 
 if (! @include_once ICINGAWEB_BASEDIR . '/library/Icinga/Application/webrouter.php') {