diff -up dokuwiki-2015-08-10a/inc/load.php.bundled dokuwiki-2015-08-10a/inc/load.php
--- dokuwiki-2015-08-10a/inc/load.php.bundled	2015-08-23 15:57:26.000000000 +0200
+++ dokuwiki-2015-08-10a/inc/load.php	2015-09-30 09:41:13.145035176 +0200
@@ -61,7 +61,7 @@ function load_autoload($name){
         'cache_renderer'        => DOKU_INC.'inc/cache.php',
         'Doku_Event'            => DOKU_INC.'inc/events.php',
         'Doku_Event_Handler'    => DOKU_INC.'inc/events.php',
-        'EmailAddressValidator' => DOKU_INC.'inc/EmailAddressValidator.php',
+        'EmailAddressValidator' => '/usr/share/php/php-email-address-validation/EmailAddressValidator.php',
         'Input'                 => DOKU_INC.'inc/Input.class.php',
         'JpegMeta'              => DOKU_INC.'inc/JpegMeta.php',
         'SimplePie'             => DOKU_INC.'inc/SimplePie.php',
diff -up dokuwiki-2015-08-10a/inc/parserutils.php.bundled dokuwiki-2015-08-10a/inc/parserutils.php
diff -up dokuwiki-2015-08-10a/vendor/composer/autoload_classmap.php.bundled dokuwiki-2015-08-10a/vendor/composer/autoload_classmap.php
--- dokuwiki-2015-08-10a/vendor/composer/autoload_classmap.php.bundled	2015-09-30 09:44:08.924683772 +0200
+++ dokuwiki-2015-08-10a/vendor/composer/autoload_classmap.php	2015-09-30 09:44:53.637848760 +0200
@@ -6,5 +6,5 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
-    'GeSHi' => $vendorDir . '/easybook/geshi/geshi.php',
+    'GeSHi' => '/usr/share/php/geshi.php',
 );