diff --git a/htdocs/lib/MailNotify.php b/htdocs/lib/MailNotify.php
index 22984ad..d7d4579 100644
--- a/htdocs/lib/MailNotify.php
+++ b/htdocs/lib/MailNotify.php
@@ -1,18 +1,13 @@
 <?php
 
-if (file_exists(stream_resolve_include_path('/usr/share/php/Twig/autoload.php'))) {
-    require_once '/usr/share/php/Twig/autoload.php';
-} elseif (stream_resolve_include_path(file_exists('/usr/share/php/Twig/Autoloader.php'))) {
-    require_once '/usr/share/php/Twig/Autoloader.php';
-    Twig_Autoloader::register();
-}
+require_once '/usr/share/php/Twig/autoload.php';
 
 class MailNotify {
     private static $twig, $adminmail;
 
     public static function init() {
-        $loader = new Twig_Loader_Filesystem('tpl/mail');
-        self::$twig = new Twig_Environment($loader, array(
+        $loader = new Twig\Loader\FilesystemLoader('tpl/mail');
+        self::$twig = new Twig\Environment($loader, array(
             'cache' => false
         ));
 
diff --git a/htdocs/lib/PageController.php b/htdocs/lib/PageController.php
index 73eea61..8b1bac9 100644
--- a/htdocs/lib/PageController.php
+++ b/htdocs/lib/PageController.php
@@ -1,11 +1,6 @@
 <?php
 
-if (file_exists(stream_resolve_include_path('/usr/share/php/Twig/autoload.php'))) {
-    require_once '/usr/share/php/Twig/autoload.php';
-} elseif (stream_resolve_include_path(file_exists('/usr/share/php/Twig/Autoloader.php'))) {
-    require_once '/usr/share/php/Twig/Autoloader.php';
-    Twig_Autoloader::register();
-}
+require_once '/usr/share/php/Twig/autoload.php';
 
 class PageController {
     public static $alerts=array();
@@ -14,8 +9,8 @@ class PageController {
     public static function init(LdapServer $server=NULL) {
         self::$server = $server;
 
-        $loader = new Twig_Loader_Filesystem('tpl/page');
-        self::$twig = new Twig_Environment($loader, array(
+        $loader = new Twig\Loader\FilesystemLoader('tpl/page');
+        self::$twig = new Twig\Environment($loader, array(
             'cache' => false
         ));