diff --git a/conf/default.php b/conf/default.php
index 8f2e398..d67da1a 100644
--- a/conf/default.php
+++ b/conf/default.php
@@ -18,6 +18,7 @@
 $conf['useToolbar']                     = 0;
 $conf['useTooltips']                    = 0;
 $conf['doLogoChangesByNamespace']       = 0;
+$conf['doLogoLinkChangesByNamespace']   = 0;
 
 $conf['_plugins']                       = '';
 $conf['defaultAddNewPage']              = '';
diff --git a/conf/metadata.php b/conf/metadata.php
index 6dd1897..f41ff9a 100644
--- a/conf/metadata.php
+++ b/conf/metadata.php
@@ -8,18 +8,19 @@
 
 if (!defined('DOKU_INC')) die();
 
-$meta['_tools']                     = array('fieldset');
-$meta['showPageToolsTitle']         = array('onoff');
-$meta['showSiteToolsTitle']         = array('onoff');
-$meta['showUserToolsTitle']         = array('onoff');
-$meta['doSiteToolsRequireLogin']    = array('onoff');
+$meta['_tools']                         = array('fieldset');
+$meta['showPageToolsTitle']             = array('onoff');
+$meta['showSiteToolsTitle']             = array('onoff');
+$meta['showUserToolsTitle']             = array('onoff');
+$meta['doSiteToolsRequireLogin']        = array('onoff');
 
-$meta['_extra']                     = array('fieldset');
-$meta['useToolbar']                 = array('onoff');
-$meta['useTooltips']                = array('onoff');
-$meta['doLogoChangesByNamespace']   = array('onoff');
+$meta['_extra']                         = array('fieldset');
+$meta['useToolbar']                     = array('onoff');
+$meta['useTooltips']                    = array('onoff');
+$meta['doLogoChangesByNamespace']       = array('onoff');
+$meta['doLogoLinkChangesByNamespace']   = array('onoff');
 
-$meta['_plugins']                   = array('fieldset');
-$meta['defaultAddNewPage']          = array('string');
+$meta['_plugins']                       = array('fieldset');
+$meta['defaultAddNewPage']              = array('string');
 
-$meta['_customizations']            = array('fieldset');
+$meta['_customizations']                = array('fieldset');
diff --git a/lang/en/settings.php b/lang/en/settings.php
index 349c97b..28c41f7 100644
--- a/lang/en/settings.php
+++ b/lang/en/settings.php
@@ -16,6 +16,7 @@
 $lang['useToolbar']                         = 'Enable the toolbar';
 $lang['useTooltips']                        = 'Enable the tooltips';
 $lang['doLogoChangesByNamespace']           = 'Should the logo changes be by namespace';
+$lang['doLogoLinkChangesByNamespace']           = 'Should the logo link changes be by namespace';
 
 $lang['_plugins']                           = 'Configure Plugins';
 $lang['defaultAddNewPage']                  = 'Namespace for AddNewPage plugin';
diff --git a/lang/fr/settings.php b/lang/fr/settings.php
index 897f2be..8041494 100644
--- a/lang/fr/settings.php
+++ b/lang/fr/settings.php
@@ -16,6 +16,7 @@
 $lang['useToolbar']                         = 'Active la barre d\'outils';
 $lang['useTooltips']                        = 'Active les infobulles';
 $lang['doLogoChangesByNamespace']           = 'Les changements de logo doivent-ils être par espace de noms';
+$lang['doLogoLinkChangesByNamespace']       = 'Les changements de liens logo doivent-ils être par espace de noms';
 
 $lang['_plugins']                           = 'Configure les Extensions';
 $lang['defaultAddNewPage']                  = 'Namespace pour l\'extension AddNewPage';
diff --git a/tpl_functions.php b/tpl_functions.php
index f4dfed8..e5ea58c 100644
--- a/tpl_functions.php
+++ b/tpl_functions.php
@@ -39,8 +39,12 @@ function tpl_getLogo()
         $logoImages[] = ':wiki:logo.png';
         $logoImages[] = 'images/logo.png';
         $logo = tpl_getMediaFile($logoImages, false, $logoSize);
+        $link = wl();
+        if(tpl_getConf('doLogoLinkChangesByNamespace')){
+            $link = str_replace(['/_media','logo.png'],['','index'],$logo);
+        }
 
-        $return .= '<a class="site-logo"  href="'.wl().'" title="'.$conf['title'].'" rel="home" accesskey="h" title="[H]">';
+        $return .= '<a class="site-logo"  href="'.$link.'" title="'.$conf['title'].'" rel="home" accesskey="h" title="[H]">';
         $return .= '<img src="'.$logo.'" '.$logoSize[3].' alt="" class="no-grav header-image" />';
         $return .= '</a>';