diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php
index ab2995d80137d4ed712c0547a3f72894c527e337..0229a5af3030ae3dda80b526dea483e51082e336 100644
--- a/conf/dokuwiki.php
+++ b/conf/dokuwiki.php
@@ -33,7 +33,7 @@ $conf['youarehere']  = 0;                 //show "You are here" navigation? 0|1
 $conf['typography']  = 1;                 //smartquote conversion 0=off, 1=doublequotes, 2=all quotes
 $conf['htmlok']      = 0;                 //may raw HTML be embedded? This may break layout and XHTML validity 0|1
 $conf['phpok']       = 0;                 //may PHP code be embedded? Never do this on the internet! 0|1
-$conf['dformat']     = 'Y/m/d H:i';       //dateformat accepted by PHPs date() function
+$conf['dformat']     = '%Y/%m/%d %H:%M';  //dateformat accepted by PHPs strftime() function
 $conf['signature']   = ' --- //[[@MAIL@|@NAME@]] @DATE@//'; //signature see wiki:config for details
 $conf['toptoclevel'] = 1;                 //Level starting with and below to include in AutoTOC (max. 5)
 $conf['maxtoclevel'] = 3;                 //Up to which level include into AutoTOC (max. 5)
diff --git a/inc/common.php b/inc/common.php
index 3cacc8ec06f67d79ce9060368468703196a7bec2..d224eae3c9798356cec4694e41ff053acf5c17ea 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -733,7 +733,7 @@ function pageTemplate($data){
   $tpl = str_replace('@USER@',$_SERVER['REMOTE_USER'],$tpl);
   $tpl = str_replace('@NAME@',$INFO['userinfo']['name'],$tpl);
   $tpl = str_replace('@MAIL@',$INFO['userinfo']['mail'],$tpl);
-  $tpl = str_replace('@DATE@',date($conf['dformat']),$tpl);
+  $tpl = str_replace('@DATE@',$conf['dformat'],$tpl);
   $tpl = strftime($tpl);
   return $tpl;
 }
@@ -932,7 +932,7 @@ function notify($id,$who,$rev='',$summary='',$minor=false,$replace=array()){
   }
 
   $ip   = clientIP();
-  $text = str_replace('@DATE@',date($conf['dformat']),$text);
+  $text = str_replace('@DATE@',strftime($conf['dformat']),$text);
   $text = str_replace('@BROWSER@',$_SERVER['HTTP_USER_AGENT'],$text);
   $text = str_replace('@IPADDRESS@',$ip,$text);
   $text = str_replace('@HOSTNAME@',gethostsbyaddrs($ip),$text);
diff --git a/inc/html.php b/inc/html.php
index c4c3348926afa4c056a25a8b1b26a89d8dfa8441..8d085c7a0cfeda3dace3811358db8ce9bad71f68 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -248,7 +248,7 @@ function html_draft(){
   $form->addHidden('date', $draft['date']);
   $form->addElement(form_makeWikiText($text, array('readonly'=>'readonly')));
   $form->addElement(form_makeOpenTag('div', array('id'=>'draft__status')));
-  $form->addElement($lang['draftdate'].' '. date($conf['dformat'],filemtime($INFO['draft'])));
+  $form->addElement($lang['draftdate'].' '. strftime($conf['dformat'],filemtime($INFO['draft'])));
   $form->addElement(form_makeCloseTag('div'));
   $form->addElement(form_makeButton('submit', 'recover', $lang['btn_recover'], array('tabindex'=>'1')));
   $form->addElement(form_makeButton('submit', 'draftdel', $lang['btn_draftdel'], array('tabindex'=>'2')));
@@ -379,7 +379,7 @@ function html_locked(){
   global $INFO;
 
   $locktime = filemtime(wikiLockFN($ID));
-  $expire = @date($conf['dformat'], $locktime + $conf['locktime'] );
+  $expire = @strftime($conf['dformat'], $locktime + $conf['locktime'] );
   $min    = round(($conf['locktime'] - (time() - $locktime) )/60);
 
   print p_locale_xhtml('locked');
@@ -415,7 +415,7 @@ function html_revisions($first=0){
     array_pop($revisions); // remove extra log entry
   }
 
-  $date = @date($conf['dformat'],$INFO['lastmod']);
+  $date = @strftime($conf['dformat'],$INFO['lastmod']);
 
   print p_locale_xhtml('revisions');
   print '<form action="'.wl($ID).'" method="post" id="page__revisions">';
@@ -443,7 +443,7 @@ function html_revisions($first=0){
   }
 
   foreach($revisions as $rev){
-    $date   = date($conf['dformat'],$rev);
+    $date   = strftime($conf['dformat'],$rev);
     $info   = getRevisionInfo($ID,$rev,true);
     $exists = page_exists($ID,$rev);
 
@@ -539,7 +539,7 @@ function html_recent($first=0){
   print '<ul>';
 
   foreach($recents as $recent){
-    $date = date($conf['dformat'],$recent['date']);
+    $date = strftime($conf['dformat'],$recent['date']);
     print ($recent['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) ? '<li class="minor">' : '<li>';
     print '<div class="li">';
 
@@ -793,7 +793,7 @@ function html_diff($text='',$intro=true){
     $l_rev   = '';
     $l_text  = rawWiki($ID,'');
     $l_head  = '<a class="wikilink1" href="'.wl($ID).'">'.
-               $ID.' '.date($conf['dformat'],@filemtime(wikiFN($ID))).'</a> '.
+               $ID.' '.strftime($conf['dformat'],@filemtime(wikiFN($ID))).'</a> '.
                $lang['current'];
 
     $r_rev   = '';
@@ -822,14 +822,14 @@ function html_diff($text='',$intro=true){
     $r_text = rawWiki($ID,$r_rev);
 
     $l_head = '<a class="wikilink1" href="'.wl($ID,"rev=$l_rev").'">'.
-              $ID.' '.date($conf['dformat'],$l_rev).'</a>';
+              $ID.' '.strftime($conf['dformat'],$l_rev).'</a>';
 
     if($r_rev){
       $r_head = '<a class="wikilink1" href="'.wl($ID,"rev=$r_rev").'">'.
-                $ID.' '.date($conf['dformat'],$r_rev).'</a>';
+                $ID.' '.strftime($conf['dformat'],$r_rev).'</a>';
     }else{
       $r_head  = '<a class="wikilink1" href="'.wl($ID).'">'.
-               $ID.' '.date($conf['dformat'],@filemtime(wikiFN($ID))).'</a> '.
+               $ID.' '.strftime($conf['dformat'],@filemtime(wikiFN($ID))).'</a> '.
                $lang['current'];
     }
   }
@@ -1044,7 +1044,7 @@ function html_edit($text=null,$include='edit'){ //FIXME: include needed?
   <div style="width:99%;">
 
    <div class="toolbar">
-      <div id="draft__status"><?php if(!empty($INFO['draft'])) echo $lang['draftdate'].' '.date($conf['dformat']);?></div>
+      <div id="draft__status"><?php if(!empty($INFO['draft'])) echo $lang['draftdate'].' '.strftime($conf['dformat']);?></div>
       <div id="tool__bar"><?php if($wr){?><a href="<?php echo DOKU_BASE?>lib/exe/mediamanager.php?ns=<?php echo $INFO['namespace']?>"
       target="_blank"><?php echo $lang['mediaselect'] ?></a><?php }?></div>
 
diff --git a/inc/init.php b/inc/init.php
index a1e18d2df34135b4fd3d597b0ff757c28d458041..22959cf1672c45a576ef3779cb8d96a00f85d3a5 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -128,6 +128,11 @@
     $conf['compression'] = 0;
   }
 
+  // fix dateformat for upgraders
+  if(strpos($conf['dformat'],'%') === false){
+    $conf['dformat'] = '%Y/%m/%d %H:%M';
+  }
+
   // precalculate file creation modes
   init_creationmodes();
 
diff --git a/inc/media.php b/inc/media.php
index 3622ea54e94f0a53fe871b5534e37df3c3b41f8b..efa200d4c4617ef9f6484dea665b7a3c8703209a 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -364,7 +364,7 @@ function media_notify($id,$file,$mime){
     if(empty($conf['notify'])) return; //notify enabled?
 
     $text = rawLocale('uploadmail');
-    $text = str_replace('@DATE@',date($conf['dformat']),$text);
+    $text = str_replace('@DATE@',strftime($conf['dformat']),$text);
     $text = str_replace('@BROWSER@',$_SERVER['HTTP_USER_AGENT'],$text);
     $text = str_replace('@IPADDRESS@',$_SERVER['REMOTE_ADDR'],$text);
     $text = str_replace('@HOSTNAME@',gethostbyaddr($_SERVER['REMOTE_ADDR']),$text);
@@ -494,7 +494,7 @@ function media_printfile($item,$auth,$jump){
         $info .= (int) $item['meta']->getField('File.Height');
         $info .= ' ';
     }
-    $info .= '<i>'.date($conf['dformat'],$item['mtime']).'</i>';
+    $info .= '<i>'.strftime($conf['dformat'],$item['mtime']).'</i>';
     $info .= ' ';
     $info .= filesize_h($item['size']);
 
diff --git a/inc/template.php b/inc/template.php
index d97558ed1a242aab00312a75cb50f73edfd091d0..b0cb56c5bfd83f4c09f7023656ffade0337a04bf 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -865,7 +865,7 @@ function tpl_pageinfo(){
     }
   }
   $fn = utf8_decodeFN($fn);
-  $date = date($conf['dformat'],$INFO['lastmod']);
+  $date = strftime($conf['dformat'],$INFO['lastmod']);
 
   // print it
   if($INFO['exists']){
diff --git a/inc/toolbar.php b/inc/toolbar.php
index 06efe642d31385daca1beb6778ae241fb2829246..00b7baefed526fbfc1952732a9173b168c56c122 100644
--- a/inc/toolbar.php
+++ b/inc/toolbar.php
@@ -24,10 +24,10 @@ function toolbar_JSdefines($varname){
     global $lang;
 
     $menu = array();
-    
+
     $evt = new Doku_Event('TOOLBAR_DEFINE', $menu);
     if ($evt->advise_before()){
-    
+
         // build button array
         $menu = array_merge($menu, array(
            array(
@@ -197,7 +197,7 @@ function toolbar_signature(){
   $sig = str_replace('@USER@',$_SERVER['REMOTE_USER'],$sig);
   $sig = str_replace('@NAME@',$INFO['userinfo']['name'],$sig);
   $sig = str_replace('@MAIL@',$INFO['userinfo']['mail'],$sig);
-  $sig = str_replace('@DATE@',date($conf['dformat']),$sig);
+  $sig = str_replace('@DATE@',strftime($conf['dformat']),$sig);
   $sig = str_replace('\\\\n','\\n',addslashes($sig));
   return $sig;
 }
diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php
index 7591ea1d5e6e19030890208ea8fc866e2a05eb96..5d8a0e4e67fd973ef7fe92c39ca8300eca7e6737 100644
--- a/lib/exe/ajax.php
+++ b/lib/exe/ajax.php
@@ -143,7 +143,7 @@ function ajax_lock(){
                   );
     $cname = getCacheName($draft['client'].$id,'.draft');
     if(io_saveFile($cname,serialize($draft))){
-      echo $lang['draftdate'].' '.date($conf['dformat']);
+      echo $lang['draftdate'].' '.strftime($conf['dformat']);
     }
   }
 
diff --git a/lib/plugins/config/lang/bg/lang.php b/lib/plugins/config/lang/bg/lang.php
index da5b836857ad648cdbece239afa12c2e150f9c14..699a7561364205a59e5c856bfa8ddbccabdab88e 100644
--- a/lib/plugins/config/lang/bg/lang.php
+++ b/lib/plugins/config/lang/bg/lang.php
@@ -48,7 +48,7 @@ $lang['youarehere']              = 'Йерархични следи';
 $lang['typography']              = 'Поправяне на разместени букви';
 $lang['htmlok']                  = 'Позволяване на HTML';
 $lang['phpok']                   = 'Позволяване на PHP';
-$lang['dformat']                 = 'Формат на датата (виж. <a href="http://www.php.net/date">date</a> функцията на PHP)';
+$lang['dformat']                 = 'Формат на датата (виж. <a href="http://www.php.net/strftime">strftime</a> функцията на PHP)';
 $lang['signature']               = 'Подпис';
 $lang['toptoclevel']             = 'Главно ниво за съдържанието';
 $lang['maxtoclevel']             = 'Максимално ниво на съдържанието';
diff --git a/lib/plugins/config/lang/ca/lang.php b/lib/plugins/config/lang/ca/lang.php
index 186026fa656ecd1fab5b9272a9b5433961698869..8d8f09c6add09bad9cd5ad0b2c836e33ab88a0e2 100644
--- a/lib/plugins/config/lang/ca/lang.php
+++ b/lib/plugins/config/lang/ca/lang.php
@@ -45,7 +45,7 @@ $lang['youarehere']            = 'Camí d\'engrunes jeràrquic';
 $lang['typography']            = 'Substitucions tipogràfiques';
 $lang['htmlok']                = 'Permet HTML incrustat';
 $lang['phpok']                 = 'Permet PHP incrustat';
-$lang['dformat']               = 'Format de data (vg. la funció PHP <a href="http://www.php.net/date">date</a>)';
+$lang['dformat']               = 'Format de data (vg. la funció PHP <a href="http://www.php.net/strftime">strftime</a>)';
 $lang['signature']             = 'Signatura';
 $lang['toptoclevel']           = 'Nivell superior per a la taula de continguts';
 $lang['maxtoclevel']           = 'Nivell màxim per a la taula de continguts';
diff --git a/lib/plugins/config/lang/cs/lang.php b/lib/plugins/config/lang/cs/lang.php
index 1b1175bae983c4b88fa3ebdf40a43cbf60f0c82d..1c08e50eeb072fa858f9edd03d4d849f0b268e60 100644
--- a/lib/plugins/config/lang/cs/lang.php
+++ b/lib/plugins/config/lang/cs/lang.php
@@ -50,7 +50,7 @@ $lang['youarehere']            = 'Hierarchická "drobečková" navigace';
 $lang['typography']            = 'Provádět typografické nahrazování';
 $lang['htmlok']                = 'Povolit vložené HTML';
 $lang['phpok']                 = 'Povolit vložené PHP';
-$lang['dformat']               = 'Formát data (viz PHP funkci <a href="http://www.php.net/date">date</a>)';
+$lang['dformat']               = 'Formát data (viz PHP funkci <a href="http://www.php.net/strftime">strftime</a>)';
 $lang['signature']             = 'Podpis';
 $lang['toptoclevel']           = 'Nejvyšší úroveň, kterou začít automaticky generovaný obsah';
 $lang['maxtoclevel']           = 'Maximální počet úrovní v automaticky generovaném obsahu';
diff --git a/lib/plugins/config/lang/da/lang.php b/lib/plugins/config/lang/da/lang.php
index 1580ccc74672b38e2c056bd9d692c65f0d231961..9000d61ac4bce07deb6ab1fcd7d7e344e8a189e5 100644
--- a/lib/plugins/config/lang/da/lang.php
+++ b/lib/plugins/config/lang/da/lang.php
@@ -64,7 +64,7 @@ $lang['youarehere']  = 'Hierarkisk sti';
 $lang['typography']  = 'Typografiske erstatninger';
 $lang['htmlok']      = 'Tillad indlejret HTML';
 $lang['phpok']       = 'Tillad indlejret PHP';
-$lang['dformat']     = 'Datoformat (se PHP\'s <a href="http://www.php.net/date">date</a> funktion)';
+$lang['dformat']     = 'Datoformat (se PHP\'s <a href="http://www.php.net/strftime">strftime</a> funktion)';
 $lang['signature']   = 'Signatur';
 $lang['toptoclevel'] = 'Højeste niveau for indholdsfortegnelse';
 $lang['maxtoclevel'] = 'Maksimalt niveau for indholdsfortegnelse';
diff --git a/lib/plugins/config/lang/de/lang.php b/lib/plugins/config/lang/de/lang.php
index 7cf190f10e75064c5a15bb8d929d4efa6b9038b1..5001f9eb6a95e4bdf031e5b7d498a51c9c1dbfe0 100644
--- a/lib/plugins/config/lang/de/lang.php
+++ b/lib/plugins/config/lang/de/lang.php
@@ -48,7 +48,7 @@ $lang['youarehere']            = 'Hierarchische Pfadnavigation verwenden';
 $lang['typography']            = 'Typographische Ersetzungen';
 $lang['htmlok']                = 'HTML erlauben';
 $lang['phpok']                 = 'PHP erlauben';
-$lang['dformat']               = 'Datumsformat (Siehe PHP <a href="http://www.php.net/date">date</a> Funktion)';
+$lang['dformat']               = 'Datumsformat (Siehe PHP <a href="http://www.php.net/strftime">strftime</a> Funktion)';
 $lang['signature']             = 'Signatur';
 $lang['toptoclevel']           = 'Inhaltsverzeichnis bei dieser Überschriftsgröße beginnen';
 $lang['maxtoclevel']           = 'Maximale Überschriftsgröße für Inhaltsverzeichnis';
diff --git a/lib/plugins/config/lang/el/lang.php b/lib/plugins/config/lang/el/lang.php
index 957e53f579afeb00ff9130cab3bce96e3a985c51..751c85895f6a5d4b4d596c06f7cbebffa2ee55bc 100644
--- a/lib/plugins/config/lang/el/lang.php
+++ b/lib/plugins/config/lang/el/lang.php
@@ -52,7 +52,7 @@ $lang['youarehere']            = 'Εμφάνιση ιεραρχικής προβ
 $lang['typography']            = 'Μετατροπή ειδικών χαρακτήρων στο τυπογραφικό ισοδύναμό τους';
 $lang['htmlok']                = 'Να επιτρέπεται η ενσωμάτωση HTML';
 $lang['phpok']                 = 'Να επιτρέπεται η ενσωμάτωση PHP';
-$lang['dformat']               = 'Μορφή ημερομηνίας (βλέπε την <a href="http://www.php.net/date">date</a> function της PHP)';
+$lang['dformat']               = 'Μορφή ημερομηνίας (βλέπε την <a href="http://www.php.net/strftime">strftime</a> function της PHP)';
 $lang['signature']             = 'Υπογραφή';
 $lang['toptoclevel']           = 'Ανώτατο επίπεδο πίνακα περιεχομένων σελίδας';
 $lang['maxtoclevel']           = 'Μέγιστο επίπεδο για πίνακα περιεχομένων σελίδας';
diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php
index d385086ca2b2744c7e0a97cc6c36acaca3de8056..79413841ecfdd7d19ce10913453f08c03387ff32 100644
--- a/lib/plugins/config/lang/en/lang.php
+++ b/lib/plugins/config/lang/en/lang.php
@@ -64,7 +64,7 @@ $lang['youarehere']  = 'Hierarchical breadcrumbs';
 $lang['typography']  = 'Do typographical replacements';
 $lang['htmlok']      = 'Allow embedded HTML';
 $lang['phpok']       = 'Allow embedded PHP';
-$lang['dformat']     = 'Date format (see PHP\'s <a href="http://www.php.net/date">date</a> function)';
+$lang['dformat']     = 'Date format (see PHP\'s <a href="http://www.php.net/strftime">strftime</a> function)';
 $lang['signature']   = 'Signature';
 $lang['toptoclevel'] = 'Top level for table of contents';
 $lang['maxtoclevel'] = 'Maximum level for table of contents';
diff --git a/lib/plugins/config/lang/eo/lang.php b/lib/plugins/config/lang/eo/lang.php
index 8c2c23e70b37ef02c85a8059593cfa023b608403..4e50bd18bb9f75534d7ce6d0551cd0d1aad3af64 100644
--- a/lib/plugins/config/lang/eo/lang.php
+++ b/lib/plugins/config/lang/eo/lang.php
@@ -47,7 +47,7 @@ $lang['youarehere']            = 'Hierarkiaj paneroj';
 $lang['typography']            = 'Fari tipografiajn anstataÅ­igojn';
 $lang['htmlok']                = 'Ebligi enmeton de HTML-aĵoj';
 $lang['phpok']                 = 'Ebligi enmeton de PHP-aĵoj';
-$lang['dformat']               = 'Formato de datoj (vidu la PHP-an funkcion <a href="http://www.php.net/date">date</a>';
+$lang['dformat']               = 'Formato de datoj (vidu la PHP-an funkcion <a href="http://www.php.net/strftime">strftime</a>';
 $lang['signature']             = 'Subskribo';
 $lang['toptoclevel']           = 'Supera nivelo por la enhavtabelo';
 $lang['maxtoclevel']           = 'Maksimuma nivelo por la enhavtabelo';
diff --git a/lib/plugins/config/lang/es/lang.php b/lib/plugins/config/lang/es/lang.php
index 6fc512ab2a98579aae2f9da7d75814a793aed88d..244a6ebb25157d0810874f0dfd26729958070bed 100644
--- a/lib/plugins/config/lang/es/lang.php
+++ b/lib/plugins/config/lang/es/lang.php
@@ -47,7 +47,7 @@ $lang['youarehere']            = 'Traza jerárquica';
 $lang['typography']            = 'Realizar reemplazos tipográficos';
 $lang['htmlok']                = 'Permitir HTML embebido';
 $lang['phpok']                 = 'Permitir PHP embebido';
-$lang['dformat']               = 'Formato de fecha (ver la función de PHP <a href="http://www.php.net/date">date</a>)';
+$lang['dformat']               = 'Formato de fecha (ver la función de PHP <a href="http://www.php.net/strftime">strftime</a>)';
 $lang['signature']             = 'Firma';
 $lang['toptoclevel']           = 'Nivel superior para la tabla de contenidos';
 $lang['maxtoclevel']           = 'Máximo nivel para la tabla de contenidos';
diff --git a/lib/plugins/config/lang/fi/lang.php b/lib/plugins/config/lang/fi/lang.php
index 6115ef9ed36259cef585316d2fb14e122baf1227..19cdd9f5530cac30cfc965b0b8200d2fba2841e3 100644
--- a/lib/plugins/config/lang/fi/lang.php
+++ b/lib/plugins/config/lang/fi/lang.php
@@ -46,7 +46,7 @@ $lang['youarehere']            = 'Hierarkiset leivänmurut';
 $lang['typography']            = 'Tee typograafiset korvaukset';
 $lang['htmlok']                = 'Salli upotettu HTML';
 $lang['phpok']                 = 'Salli upotettu PHP';
-$lang['dformat']               = 'Päivämäärän muoto (katso PHPn <a href="http://www.php.net/date">date</a> functiota)';
+$lang['dformat']               = 'Päivämäärän muoto (katso PHPn <a href="http://www.php.net/strftime">strftime</a> functiota)';
 $lang['signature']             = 'Allekirjoitus';
 $lang['toptoclevel']           = 'Ylätason sisällysluettelo';
 $lang['maxtoclevel']           = 'Sisällysluettelon suurin syvyys';
diff --git a/lib/plugins/config/lang/fr/lang.php b/lib/plugins/config/lang/fr/lang.php
index 30f80fc9f9366a6a8a97cb957c77d2fbe0f8a9a4..eecf1e6fd76111983b5538dd0ea645c8c32e16e9 100644
--- a/lib/plugins/config/lang/fr/lang.php
+++ b/lib/plugins/config/lang/fr/lang.php
@@ -49,7 +49,7 @@ $lang['youarehere']            = 'Traces hiérarchiques';
 $lang['typography']            = 'Effectuer des améliorations typographiques';
 $lang['htmlok']                = 'Permettre html dans les pages';
 $lang['phpok']                 = 'Permettre php dans les pages';
-$lang['dformat']               = 'Format de date (cf. fonction <a href="http://www.php.net/date">date</a> de PHP)';
+$lang['dformat']               = 'Format de date (cf. fonction <a href="http://www.php.net/strftime">strftime</a> de PHP)';
 $lang['signature']             = 'Signature';
 $lang['toptoclevel']           = 'Niveau supérieur pour figurer dans la table des matières';
 $lang['maxtoclevel']           = 'Niveau maximum pour figurer dans la table des matières';
diff --git a/lib/plugins/config/lang/gl/lang.php b/lib/plugins/config/lang/gl/lang.php
index e937df6212bbd8e9679c754671e71490bd6e6e6f..f48dd0c6a13586ed854ea92734318c9773b520a9 100644
--- a/lib/plugins/config/lang/gl/lang.php
+++ b/lib/plugins/config/lang/gl/lang.php
@@ -46,7 +46,7 @@ $lang['youarehere']            = 'Niveis xerárquicos da estrutura de navegació
 $lang['typography']            = 'Facer substitucións tipográficas';
 $lang['htmlok']                = 'Permitir a inserción de HTML';
 $lang['phpok']                 = 'Permitir a inserción de PHP';
-$lang['dformat']               = 'Formato de Data (bótalle un ollo á función <a href="http://www.php.net/date">date</a> do PHP)';
+$lang['dformat']               = 'Formato de Data (bótalle un ollo á función <a href="http://www.php.net/strftime">strftime</a> do PHP)';
 $lang['signature']             = 'Sinatura';
 $lang['toptoclevel']           = 'Nivel superior para a táboa de contidos';
 $lang['maxtoclevel']           = 'Nivel máximo para a táboa de contidos';
diff --git a/lib/plugins/config/lang/he/lang.php b/lib/plugins/config/lang/he/lang.php
index 6a5627e4969d972c73d4328ca04c497f6a91b500..da550268d1859bfe34722a745ebc62e7c2a954b5 100644
--- a/lib/plugins/config/lang/he/lang.php
+++ b/lib/plugins/config/lang/he/lang.php
@@ -65,7 +65,7 @@ $lang['youarehere']  = 'עקבות היררכיות להיסטוריה';
 $lang['typography']  = 'שימוש בחלופות טיפוגרפיות';
 $lang['htmlok']      = 'אישור שיבוץ HTML';
 $lang['phpok']       = 'אישור שיבוץ PHP';
-$lang['dformat']     = 'תסדיר תאריך (נא לפנות לפונקציה <a href="http://www.php.net/date">date</a> של PHP)';
+$lang['dformat']     = 'תסדיר תאריך (נא לפנות לפונקציה <a href="http://www.php.net/strftime">strftime</a> של PHP)';
 $lang['signature']   = 'חתימה';
 $lang['toptoclevel'] = 'רמה עליונה בתוכן הענינים';
 $lang['maxtoclevel'] = 'רמה מירבית בתוכן הענינים';
diff --git a/lib/plugins/config/lang/hu/lang.php b/lib/plugins/config/lang/hu/lang.php
index e2e86b9247aa6b1752b41232f135bee4d703404f..26e6e2205abe7479ef4e691262ec68c0690d4916 100644
--- a/lib/plugins/config/lang/hu/lang.php
+++ b/lib/plugins/config/lang/hu/lang.php
@@ -47,7 +47,7 @@ $lang['youarehere']            = 'Hierarchikus nyomvonal';
 $lang['typography']            = 'Legyen-e tipográfiai csere';
 $lang['htmlok']                = 'Beágyazott HTML engedélyezése';
 $lang['phpok']                 = 'Beágyazott PHP engedélyezése';
-$lang['dformat']               = 'Dátum formázás (lásd a PHP <a href="http://www.php.net/date">date</a> függvényt)';
+$lang['dformat']               = 'Dátum formázás (lásd a PHP <a href="http://www.php.net/strftime">strftime</a> függvényt)';
 $lang['signature']             = 'Aláírás';
 $lang['toptoclevel']           = 'A tartalomjegyzék felső szintje';
 $lang['maxtoclevel']           = 'A tartalomjegyzék mélysége';
diff --git a/lib/plugins/config/lang/ja/lang.php b/lib/plugins/config/lang/ja/lang.php
index f6a5ef56f043e9986a5459750fd1b07fdf47afb9..385eeb28b4edf719c848ce89c89d0e52203ed3e7 100644
--- a/lib/plugins/config/lang/ja/lang.php
+++ b/lib/plugins/config/lang/ja/lang.php
@@ -48,7 +48,7 @@ $lang['youarehere']              = '現在位置を表示';
 $lang['typography']              = 'タイポグラフィー変換';
 $lang['htmlok']                  = 'HTML埋め込み';
 $lang['phpok']                   = 'PHP埋め込み';
-$lang['dformat']                 = '日付フォーマット（PHPの<a href="http://www.php.net/date">date</a>関数を参照）';
+$lang['dformat']                 = '日付フォーマット（PHPの<a href="http://www.php.net/strftime">strftime</a>関数を参照）';
 $lang['signature']               = '署名';
 $lang['toptoclevel']             = '目次 トップレベル見出し';
 $lang['maxtoclevel']             = '目次 表示限度見出し';
diff --git a/lib/plugins/config/lang/ko/lang.php b/lib/plugins/config/lang/ko/lang.php
index 761acdfeae70f3a2365381dfb1f32cc31d1d8256..c29bdd08766a858fe36d767d3bf381400c22fb4b 100644
--- a/lib/plugins/config/lang/ko/lang.php
+++ b/lib/plugins/config/lang/ko/lang.php
@@ -64,7 +64,7 @@ $lang['youarehere']  = '계층형 위치 추적';
 $lang['typography']  = '기호 대체';
 $lang['htmlok']      = 'HTML 내장 허용';
 $lang['phpok']       = 'PHP 내장 허용';
-$lang['dformat']     = '날짜 포맷 (PHP <a href="http://www.php.net/date">date</a> 기능) 참조';
+$lang['dformat']     = '날짜 포맷 (PHP <a href="http://www.php.net/strftime">strftime</a> 기능) 참조';
 $lang['signature']   = '서명';
 $lang['toptoclevel'] = '목차 최상위 항목';
 $lang['maxtoclevel'] = '목차 최대 단계';
diff --git a/lib/plugins/config/lang/nl/lang.php b/lib/plugins/config/lang/nl/lang.php
index 70aadc64a8d0f0669710eab7857b7be90ad05bf8..6a94056aa4083bcae6891de0b9273dce48dd357b 100644
--- a/lib/plugins/config/lang/nl/lang.php
+++ b/lib/plugins/config/lang/nl/lang.php
@@ -47,7 +47,7 @@ $lang['youarehere']            = 'Hierarchische broodkruimels';
 $lang['typography']            = 'Breng typografische wijzigingen aan';
 $lang['htmlok']                = 'Embedded HTML toestaan';
 $lang['phpok']                 = 'Embedded PHP toestaan';
-$lang['dformat']               = 'Datum formaat (zie de PHP <a href="http://www.php.net/date">date</a> functie)';
+$lang['dformat']               = 'Datum formaat (zie de PHP <a href="http://www.php.net/strftime">strftime</a> functie)';
 $lang['signature']             = 'Ondertekening';
 $lang['toptoclevel']           = 'Bovenste niveau voor inhoudsopgave';
 $lang['maxtoclevel']           = 'Laagste niveau voor inhoudsopgave';
diff --git a/lib/plugins/config/lang/pt-br/lang.php b/lib/plugins/config/lang/pt-br/lang.php
index 3f35d4769b599f845d7ffd9b111074624bf74482..4d93001f0d9c84060d4d802b0621cdf46e52df58 100644
--- a/lib/plugins/config/lang/pt-br/lang.php
+++ b/lib/plugins/config/lang/pt-br/lang.php
@@ -45,7 +45,7 @@ $lang['youarehere']            = 'Trilha hierárquica';
 $lang['typography']            = 'Efetuar modificações tipográficas';
 $lang['htmlok']                = 'Permitir incorporação de HTML';
 $lang['phpok']                 = 'Permitir incorporação de PHP';
-$lang['dformat']               = 'Formato da data (veja a função <a href="http://www.php.net/date">date</a> do PHP)';
+$lang['dformat']               = 'Formato da data (veja a função <a href="http://www.php.net/strftime">strftime</a> do PHP)';
 $lang['signature']             = 'Assinatura';
 $lang['toptoclevel']           = 'Nível mais alto para a tabela de conteúdos';
 $lang['maxtoclevel']           = 'Nível máximo para a tabela de conteúdos';
diff --git a/lib/plugins/config/lang/pt/lang.php b/lib/plugins/config/lang/pt/lang.php
index 8a9e8b698ff7ad986d7810b590fafa2e9c17c1db..d5ecce0062784403c95151979c1edc41913c5346 100644
--- a/lib/plugins/config/lang/pt/lang.php
+++ b/lib/plugins/config/lang/pt/lang.php
@@ -41,7 +41,7 @@ $lang['youarehere']            = 'Breadcrumbs hierárquicas';
 $lang['typography']            = 'Executar substituições tipográficas';
 $lang['htmlok']                = 'Permitir embeber HTML';
 $lang['phpok']                 = 'Permitir embeber PHP';
-$lang['dformat']               = 'Formato de Data (ver função PHP\'s <a href="http://www.php.net/date">date</a>)';
+$lang['dformat']               = 'Formato de Data (ver função PHP\'s <a href="http://www.php.net/strftime">strftime</a>)';
 $lang['signature']             = 'Assinatura';
 $lang['toptoclevel']           = 'Nível de topo para a tabela de conteúdo';
 $lang['maxtoclevel']           = 'Máximo nível para a tabela de conteúdo';
diff --git a/lib/plugins/config/lang/ro/lang.php b/lib/plugins/config/lang/ro/lang.php
index 9bbef0c86b2234a46b90a4c04a9e3906ccbc13bc..9bb613bf6f7571b48c083c12b1ead9b62d3b5d58 100644
--- a/lib/plugins/config/lang/ro/lang.php
+++ b/lib/plugins/config/lang/ro/lang.php
@@ -44,7 +44,7 @@ $lang['youarehere']            = 'Structura ierarhică a "urmelor" lăsate';
 $lang['typography']            = 'Fă înlocuiri topografice';
 $lang['htmlok']                = 'Permite intercalare cod HTML';
 $lang['phpok']                 = 'Permite intercalare cod PHP';
-$lang['dformat']               = 'Format dată (vezi funcţia PHP <a href="http://www.php.net/date">date</a>)';
+$lang['dformat']               = 'Format dată (vezi funcţia PHP <a href="http://www.php.net/strftime">strftime</a>)';
 $lang['signature']             = 'Semnătura';
 $lang['toptoclevel']           = 'Primul nivel pentru cuprins';
 $lang['maxtoclevel']           = 'Nivelul maxim pentru cuprins';
diff --git a/lib/plugins/config/lang/sv/lang.php b/lib/plugins/config/lang/sv/lang.php
index 4ee012f2ff893643f76e9d9c28b2e0ae56734f4b..44ea4c85718c00aef479b9883482d03ea7491639 100644
--- a/lib/plugins/config/lang/sv/lang.php
+++ b/lib/plugins/config/lang/sv/lang.php
@@ -48,7 +48,7 @@ $lang['youarehere']            = 'Hierarkiska spår';
 $lang['typography']            = 'Aktivera typografiska ersättningar';
 $lang['htmlok']                = 'Tillåt inbäddad HTML';
 $lang['phpok']                 = 'Tillåt inbäddad PHP';
-$lang['dformat']               = 'Datumformat (se PHP:s <a href="http://www.php.net/date">date</a>-funktion)';
+$lang['dformat']               = 'Datumformat (se PHP:s <a href="http://www.php.net/strftime">strftime</a>-funktion)';
 $lang['signature']             = 'Signatur';
 $lang['toptoclevel']           = 'Toppnivå för innehållsförteckning';
 $lang['maxtoclevel']           = 'Maximal nivå för innehållsförteckning';
diff --git a/lib/plugins/config/lang/uk/lang.php b/lib/plugins/config/lang/uk/lang.php
index de122915f1fd8135fae0cea606aaa0ff07c59525..cf751213b202a04b90fd23a48c23e530223a9edb 100644
--- a/lib/plugins/config/lang/uk/lang.php
+++ b/lib/plugins/config/lang/uk/lang.php
@@ -65,7 +65,7 @@ $lang['youarehere']  = 'Показувати "Ви тут"';
 $lang['typography']  = 'Заміняти типографськи символи';
 $lang['htmlok']      = 'Дозволити HTML';
 $lang['phpok']       = 'Дозволити PHP';
-$lang['dformat']     = 'Формат дати (дивіться функцію <a href="http://www.php.net/date">date</a> PHP)';
+$lang['dformat']     = 'Формат дати (дивіться функцію <a href="http://www.php.net/strftime">strftime</a> PHP)';
 $lang['signature']   = 'Підпис';
 $lang['toptoclevel'] = 'Мінімальний рівень для змісту';
 $lang['maxtoclevel'] = 'Максимальний рівень для змісту';
diff --git a/lib/plugins/config/lang/zh/lang.php b/lib/plugins/config/lang/zh/lang.php
index accd85d47a33f135287d7c337442d4053dc7729a..e7f83151fd0ace66ea7872def5d5666204d621c6 100644
--- a/lib/plugins/config/lang/zh/lang.php
+++ b/lib/plugins/config/lang/zh/lang.php
@@ -64,7 +64,7 @@ $lang['youarehere']  = '显示“您在这里”';
 $lang['typography']  = '进行字符替换';
 $lang['htmlok']      = '允许嵌入式 HTML';
 $lang['phpok']       = '允许嵌入式 PHP';
-$lang['dformat']     = '日期格式（参见 PHP 的 <a href="http://www.php.net/date">date</a> 功能）';
+$lang['dformat']     = '日期格式（参见 PHP 的 <a href="http://www.php.net/strftime">strftime</a> 功能）';
 $lang['signature']   = '签名样式';
 $lang['toptoclevel'] = '目录的最顶层';
 $lang['maxtoclevel'] = '目录的最多层次';
diff --git a/lib/tpl/default/detail.php b/lib/tpl/default/detail.php
index d62031fb87ab37887fe5b0cf50da215ed5c57167..d0e07ce1af21a812afdcfcb1dde8b4c2988e1938 100644
--- a/lib/tpl/default/detail.php
+++ b/lib/tpl/default/detail.php
@@ -56,7 +56,7 @@ if (!defined('DOKU_INC')) die();
       <dl class="img_tags">
         <?php
           $t = tpl_img_getTag('Date.EarliestTime');
-          if($t) print '<dt>'.$lang['img_date'].':</dt><dd>'.date($conf['dformat'],$t).'</dd>';
+          if($t) print '<dt>'.$lang['img_date'].':</dt><dd>'.strftime($conf['dformat'],$t).'</dd>';
 
           $t = tpl_img_getTag('File.Name');
           if($t) print '<dt>'.$lang['img_fname'].':</dt><dd>'.hsc($t).'</dd>';