diff --git a/.gitignore b/.gitignore
index 3f4cc32..f446abc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ dokuwiki-2009-12-25c.tgz
 /dokuwiki-2013-12-08.tgz
 /dokuwiki-2014-09-29b.tgz
 /dokuwiki-2014-09-29c.tgz
+/dokuwiki-2015-08-10a.tgz
diff --git a/dokuwiki-rm-bundled-libs.patch b/dokuwiki-rm-bundled-libs.patch
index cf299b8..8f0b830 100644
--- a/dokuwiki-rm-bundled-libs.patch
+++ b/dokuwiki-rm-bundled-libs.patch
@@ -1,7 +1,7 @@
-diff -up dokuwiki-2013-05-10a/inc/load.php.orig dokuwiki-2013-05-10a/inc/load.php
---- dokuwiki-2013-05-10a/inc/load.php.orig	2013-06-16 22:03:48.000000000 +0200
-+++ dokuwiki-2013-05-10a/inc/load.php	2013-09-03 14:11:06.632296194 +0200
-@@ -60,7 +60,7 @@ function load_autoload($name){
+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',
@@ -10,33 +10,14 @@ diff -up dokuwiki-2013-05-10a/inc/load.php.orig dokuwiki-2013-05-10a/inc/load.ph
          'Input'                 => DOKU_INC.'inc/Input.class.php',
          'JpegMeta'              => DOKU_INC.'inc/JpegMeta.php',
          'SimplePie'             => DOKU_INC.'inc/SimplePie.php',
-@@ -69,7 +69,7 @@ function load_autoload($name){
-         'IXR_Client'            => DOKU_INC.'inc/IXR_Library.php',
-         'IXR_IntrospectionServer' => DOKU_INC.'inc/IXR_Library.php',
-         'Doku_Plugin_Controller'=> DOKU_INC.'inc/plugincontroller.class.php',
--        'GeSHi'                 => DOKU_INC.'inc/geshi.php',
-+        'GeSHi'                 => '/usr/share/php/geshi.php',
-         'Tar'                   => DOKU_INC.'inc/Tar.class.php',
-         'TarLib'                => DOKU_INC.'inc/TarLib.class.php',
-         'ZipLib'                => DOKU_INC.'inc/ZipLib.class.php',
-diff -up dokuwiki-2013-05-10a/inc/parserutils.php.orig dokuwiki-2013-05-10a/inc/parserutils.php
---- dokuwiki-2013-05-10a/inc/parserutils.php.orig	2013-06-16 22:03:48.000000000 +0200
-+++ dokuwiki-2013-05-10a/inc/parserutils.php	2013-09-03 14:10:36.965839661 +0200
-@@ -695,14 +695,14 @@ function p_xhtml_cached_geshi($code, $la
-     $cache = getCacheName($language.$code,".code");
-     $ctime = @filemtime($cache);
-     if($ctime && !$INPUT->bool('purge') &&
--            $ctime > filemtime(DOKU_INC.'inc/geshi.php') &&                 // geshi changed
--            $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') &&  // language syntax definition changed
-+            $ctime > filemtime('/usr/share/php/geshi.php') &&                 // geshi changed
-+            $ctime > @filemtime('/usr/share/php/geshi/'.$language.'.php') &&  // language syntax definition changed
-             $ctime > filemtime(reset($config_cascade['main']['default']))){ // dokuwiki changed
-         $highlighted_code = io_readFile($cache, false);
+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);
  
-     } else {
- 
--        $geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi');
-+        $geshi = new GeSHi($code, $language, '/usr/share/php/geshi');
-         $geshi->set_encoding('utf-8');
-         $geshi->enable_classes();
-         $geshi->set_header_type(GESHI_HEADER_PRE);
+ return array(
+-    'GeSHi' => $vendorDir . '/easybook/geshi/geshi.php',
++    'GeSHi' => '/usr/share/php/geshi.php',
+ );
diff --git a/dokuwiki.spec b/dokuwiki.spec
index 2b01776..a69b299 100644
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -1,9 +1,9 @@
-%global		releasenum 2014-09-29c
-%global		releasetag 20140929c
+%global		releasenum 2015-08-10a
+%global		releasetag 20150810a
 
 Name:		dokuwiki
 Version:	0
-Release:	0.25.%{releasetag}%{?dist}
+Release:	0.26.%{releasetag}%{?dist}
 Summary:	Standards compliant simple to use wiki
 Group:		Applications/Internet
 License:	GPLv2
@@ -45,9 +45,9 @@ Configures DokuWiki to run in SELinux enabled environments.
 
 # Remove bundled code
 rm inc/EmailAddressValidator.php
-rm -r inc/geshi
+rm -r vendor/easybook/geshi
 
-%patch1 -p1 
+%patch1 -p1 -b .bundled
 
 chmod a-x inc/lang/az/*.{txt,html}
 
@@ -207,6 +207,9 @@ fi
 %doc DOKUWIKI-SELINUX.README
 
 %changelog
+* Wed Sep 30 2015 Adam Tkac <vonsch@gmail.com> - 0.0.26.20150810a
+- update to the latest upstream
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0-0.25.20140929c
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 77736d8..229dc08 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f83a6d5b219d451106ef441176702b37  dokuwiki-2014-09-29c.tgz
+a4b8ae00ce94e42d4ef52dd8f4ad30fe  dokuwiki-2015-08-10a.tgz