diff --git a/bin/changefield.exe.php b/bin/changefield.exe.php
index 47e2d1e409..965a494239 100644
--- a/bin/changefield.exe.php
+++ b/bin/changefield.exe.php
@@ -15,7 +15,7 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once dirname(__FILE__) . "/../lib/bootstrap.php";
+require_once __DIR__ . "/../lib/bootstrap.php";
 
 $registry = registry::get_instance();
 require($registry->get('GV_RootPath') . "lib/classes/deprecated/getargs.php");  // le parser d'arguments de la ligne de commande
diff --git a/bin/dumpbase.exe.php b/bin/dumpbase.exe.php
index a7dad8487f..1df4e0a890 100644
--- a/bin/dumpbase.exe.php
+++ b/bin/dumpbase.exe.php
@@ -15,7 +15,7 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once dirname(__FILE__) . "/../lib/bootstrap.php";
+require_once __DIR__ . "/../lib/bootstrap.php";
 define('DOCPERDIR', 100);
 
 
diff --git a/bin/suggest_cron.php b/bin/suggest_cron.php
index 06891067e4..23f4c88e8b 100644
--- a/bin/suggest_cron.php
+++ b/bin/suggest_cron.php
@@ -1,6 +1,6 @@
 <?php
 
-include dirname(__FILE__) . '/../lib/bootstrap.php';
+include __DIR__ . '/../lib/bootstrap.php';
 define('FREQ_THRESHOLD', 10);
 define('SUGGEST_DEBUG', 0);
 
diff --git a/bin/testextension2.php b/bin/testextension2.php
index 5d4f824dbf..6ad7250d04 100644
--- a/bin/testextension2.php
+++ b/bin/testextension2.php
@@ -18,7 +18,7 @@ define('USR_ID', 4);
 
 set_time_limit(300);
 
-require(dirname(__FILE__) . "/../lib/bootstrap.php");
+require(__DIR__ . "/../lib/bootstrap.php");
 
 phrasea::headers();
 $registry = registry::get_instance();
diff --git a/lib/Alchemy/Phrasea/Application/Root.php b/lib/Alchemy/Phrasea/Application/Root.php
index f4f9548afb..5c406e30bf 100644
--- a/lib/Alchemy/Phrasea/Application/Root.php
+++ b/lib/Alchemy/Phrasea/Application/Root.php
@@ -45,7 +45,7 @@ return call_user_func(function()
 
                   $app->get('robots.txt', function() use ($app)
                           {
-                            require dirname(__FILE__) . "/../lib/bootstrap.php";
+                            require __DIR__ . "/../lib/bootstrap.php";
                             $appbox = appbox::get_instance();
 
                             $registry = $appbox->get_registry();
diff --git a/lib/Alchemy/Phrasea/Application/Setup.php b/lib/Alchemy/Phrasea/Application/Setup.php
index e620cd2db0..be6c0d7f68 100644
--- a/lib/Alchemy/Phrasea/Application/Setup.php
+++ b/lib/Alchemy/Phrasea/Application/Setup.php
@@ -15,7 +15,7 @@ use Silex\Application;
 use Alchemy\Phrasea\Controller\Setup as Controller;
 use Alchemy\Phrasea\Controller\Utils as ControllerUtils;
 
-require_once dirname(__FILE__) . '/../../../bootstrap.php';
+require_once __DIR__ . '/../../../bootstrap.php';
 /**
  *
  * @package
diff --git a/lib/Alchemy/Phrasea/Controller/Setup/Installer.php b/lib/Alchemy/Phrasea/Controller/Setup/Installer.php
index 1e1e5fdd06..9437af03a3 100644
--- a/lib/Alchemy/Phrasea/Controller/Setup/Installer.php
+++ b/lib/Alchemy/Phrasea/Controller/Setup/Installer.php
@@ -126,7 +126,7 @@ class Installer implements ControllerProviderInterface
                   , 'warnings' => $warnings
                   , 'current_servername' => $request->getScheme() . '://' . $request->getHttpHost() . '/'
                   , 'discovered_binaries' => \setup::discover_binaries()
-                  , 'rootpath' => dirname(dirname(dirname(dirname(dirname(__FILE__))))) . '/'
+                  , 'rootpath' => dirname(dirname(dirname(dirname(__DIR__)))) . '/'
                       )
               );
 
@@ -205,7 +205,7 @@ class Installer implements ControllerProviderInterface
                   if ($databox_name)
                   {
 
-                    $template = new \system_file(dirname(__FILE__) . '/../../../conf.d/data_templates/' . $request->get('db_template') . '.xml');
+                    $template = new \system_file(__DIR__ . '/../../../conf.d/data_templates/' . $request->get('db_template') . '.xml');
                     $databox = \databox::create($appbox, $connbas, $template, $registry);
                     $user->ACL()
                             ->give_access_to_sbas(array($databox->get_sbas_id()))
diff --git a/lib/Alchemy/Phrasea/Controller/Setup/Upgrader.php b/lib/Alchemy/Phrasea/Controller/Setup/Upgrader.php
index 1dc98f8eea..e9a0e74034 100644
--- a/lib/Alchemy/Phrasea/Controller/Setup/Upgrader.php
+++ b/lib/Alchemy/Phrasea/Controller/Setup/Upgrader.php
@@ -40,7 +40,7 @@ class Upgrader implements ControllerProviderInterface
 
     $controllers->get('/', function() use ($app)
             {
-              require_once dirname(__FILE__) . '/../../../../bootstrap.php';
+              require_once __DIR__ . '/../../../../bootstrap.php';
               $upgrade_status = \Setup_Upgrade::get_status();
 
               ini_set('display_errors', 'on');
@@ -62,7 +62,7 @@ class Upgrader implements ControllerProviderInterface
 
     $controllers->get('/status/', function() use ($app)
             {
-              require_once dirname(__FILE__) . '/../../../../bootstrap.php';
+              require_once __DIR__ . '/../../../../bootstrap.php';
               ini_set('display_errors', 'on');
 
               $datas = \Setup_Upgrade::get_status();
@@ -72,7 +72,7 @@ class Upgrader implements ControllerProviderInterface
 
     $controllers->post('/execute/', function() use ($app)
             {
-              require_once dirname(__FILE__) . '/../../../../bootstrap.php';
+              require_once __DIR__ . '/../../../../bootstrap.php';
               ini_set('display_errors', 'on');
               set_time_limit(0);
               session_write_close();
diff --git a/www/admin/demand.php b/www/admin/demand.php
index 8dc2af11f8..98de70e7a6 100644
--- a/www/admin/demand.php
+++ b/www/admin/demand.php
@@ -194,7 +194,7 @@ if (!is_null($templates) || !is_null($parm['deny']) || !is_null($parm['accept'])
     if ($row)
     {
 
-      require_once(dirname (__FILE__) . '/../../lib/vendor/PHPMailer_v5.1/class.phpmailer.php');
+      require_once(__DIR__ . '/../../lib/vendor/PHPMailer_v5.1/class.phpmailer.php');
       if (PHPMailer::ValidateAddress($row['usr_mail']))
       {
         foreach ($bases as $bas => $isok)
diff --git a/www/include/minify/config.php b/www/include/minify/config.php
index b40ee41f4c..5582e1eb55 100644
--- a/www/include/minify/config.php
+++ b/www/include/minify/config.php
@@ -1,5 +1,5 @@
 <?php
-$_SERVER["DOCUMENT_ROOT"] = dirname( __FILE__ ) . '/../../../www/';
+$_SERVER["DOCUMENT_ROOT"] = __DIR__ . '/../../../www/';
 /**
  * Configuration for default Minify application
  * @package Minify
@@ -151,7 +151,7 @@ $min_uploaderHoursBehind = 0;
  * this accordingly.
  */
 $min_libPath = __DIR__ . '/lib';
-$min_cachePath = dirname( __FILE__ ) . '/../../../tmp/cache_minify';
+$min_cachePath = __DIR__ . '/../../../tmp/cache_minify';
 
 
 // try to disable output_compression (may not have an effect)
diff --git a/www/login/forgotpwd.php b/www/login/forgotpwd.php
index 30073345bd..c19cd3279c 100644
--- a/www/login/forgotpwd.php
+++ b/www/login/forgotpwd.php
@@ -27,7 +27,7 @@ $needed = array();
 
 if (isset($parm["mail"]) && trim($parm["mail"]) != "")
 {
-  require_once(dirname (__FILE__) . '/../../lib/vendor/PHPMailer_v5.1/class.phpmailer.php');
+  require_once(__DIR__ . '/../../lib/vendor/PHPMailer_v5.1/class.phpmailer.php');
   if (!PHPMailer::ValidateAddress($parm['mail']))
   {
     return phrasea::redirect('/login/forgotpwd.php?error=noaccount');
diff --git a/www/login/register-confirm.php b/www/login/register-confirm.php
index 30070add09..5ac4ae4d6d 100644
--- a/www/login/register-confirm.php
+++ b/www/login/register-confirm.php
@@ -41,7 +41,7 @@ catch(Exception_NotFound $e)
   $user->set_mail_locked(false);
   random::removeToken($parm['code']);
 
-  require_once(dirname (__FILE__) . '/../../lib/vendor/PHPMailer_v5.1/class.phpmailer.php');
+  require_once(__DIR__ . '/../../lib/vendor/PHPMailer_v5.1/class.phpmailer.php');
   if (PHPMailer::ValidateAddress($user->get_email()))
   {
     if (count($user->ACL()->get_granted_base()) > 0)
diff --git a/www/login/register.php b/www/login/register.php
index bffcf77c17..7c0d5ecb81 100644
--- a/www/login/register.php
+++ b/www/login/register.php
@@ -102,7 +102,7 @@ if ($request->has_post_datas())
       $needed['form_password'] = _('forms::la valeur donnee contient des caracteres invalides');
 
     //2 - on verifie que lemail a lair correcte si elle est requise
-    require_once(dirname (__FILE__) . '/../../lib/vendor/PHPMailer_v5.1/class.phpmailer.php');
+    require_once(__DIR__ . '/../../lib/vendor/PHPMailer_v5.1/class.phpmailer.php');
     if (trim($parm['form_email']) != '' && !PHPMailer::ValidateAddress($parm['form_email']))
       $needed['form_email'] = _('forms::l\'email semble invalide');