diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php
index 47b427fa347d6214ff52bfb848089fe758b37c28..8be47024c37168bfd5480f37ffe1417087dda02a 100644
--- a/conf/dokuwiki.php
+++ b/conf/dokuwiki.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
  * This is DokuWiki's Main Configuration file
  * This is a piece of PHP code so PHP syntax applies!
diff --git a/conf/local.php.dist b/conf/local.php.dist
index 54cb4015c37c120226f5c901aea1300a302af33c..bcbb19e638ae27eb5413e24dc8d7f4f147d9b2ca 100644
--- a/conf/local.php.dist
+++ b/conf/local.php.dist
@@ -1,4 +1,4 @@
-<?
+<?php
 /*
   This is an example of how a local.php coul look like.
   Simply copy the options you want to change from dokuwiki.php
diff --git a/inc/lang/cs/lang.php b/inc/lang/cs/lang.php
index e4f49cb9af809f01ad76efc2c81003598b00c242..d6a8cae7b0a7dd9b16d8bb4fe887b6fa8cdb4805 100644
--- a/inc/lang/cs/lang.php
+++ b/inc/lang/cs/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
  * Czech language file
  *
diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php
index 2d8e791bcb5fe5f19a2ecd979aa178945f081500..de20057d5790f903f36733a0d63563505b5400cd 100644
--- a/inc/lang/da/lang.php
+++ b/inc/lang/da/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
  * danish language file
  *
diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index ae7932806851327e2f21c165793e0233b2dfc186..53aa00bd0b8c8fad6f8e9b93fc90ec6b1ed83834 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
  * german language file
  *
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 93f43d08962cdffb70f3ffd7118c76699c2e2ae3..ba9eb4e52dfdbbec1c4c141bf30d2793cd84e95f 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
  * english language file
  *
diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php
index b7b60429c0c14a6a708d1278962b681611c15479..bf0c42ef39b7d1192743a993438d3128d8f507ef 100644
--- a/inc/lang/eo/lang.php
+++ b/inc/lang/eo/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
  * Esperantiga dosiero
  *
diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php
index 0552e2997e921f21413800fef0ea353e98b8d9f1..c3b4e293896bef2fc208a910e74f9076ab1d77fc 100644
--- a/inc/lang/es/lang.php
+++ b/inc/lang/es/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
  * spanish language file
  *
diff --git a/inc/lang/et/lang.php b/inc/lang/et/lang.php
index 465482ae03020d9b51c8dfa4851cc7dcd9336a31..68e5a13b66e9bc7bfac12060b237d8b8a393767c 100644
--- a/inc/lang/et/lang.php
+++ b/inc/lang/et/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
  * Estonian language file
  *
diff --git a/inc/lang/eu/lang.php b/inc/lang/eu/lang.php
index 4abf82815603e8aa1f8c4aec489120dd4629a9c3..b701beed3bf5575bdb2d47c34ceadccd91e9170b 100644
--- a/inc/lang/eu/lang.php
+++ b/inc/lang/eu/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
  * Basque language file
  *
diff --git a/inc/lang/fi/lang.php b/inc/lang/fi/lang.php
index 93d8c7c5fe6308897731d6c5cd86ae51088a0e75..5fb0b50db88189c4bd5c54a73a072b9376c0d9d9 100644
--- a/inc/lang/fi/lang.php
+++ b/inc/lang/fi/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
  * Finnish language file
  *
diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index 583e6acd5c399dfb0e8258cbbfd6df76b6feb544..5e2fa1dfc719a7408ede2fed39bf4d9dd326676b 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
  * french language file
  *
diff --git a/inc/lang/he/lang.php b/inc/lang/he/lang.php
index 329314edd60abe1649100c5a57565b2e0fc06e08..8a6f4a9ad13a82ed1963ae1ac3bdc8f9d1893c2f 100644
--- a/inc/lang/he/lang.php
+++ b/inc/lang/he/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
  * Hebrew language file
  *
diff --git a/inc/lang/hu/lang.php b/inc/lang/hu/lang.php
index ac8f26b19ffab889c5386f0dcb51583494c95f17..d66202780d376e2095a2b3b91e7c28b828088184 100644
--- a/inc/lang/hu/lang.php
+++ b/inc/lang/hu/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
  * Hungarian language file
  *
diff --git a/inc/lang/it/lang.php b/inc/lang/it/lang.php
index ca163afc96157b10da9b7b185e8e32959172ae1c..0bafd77a74f74009ffe81f17daae18be24c21f65 100644
--- a/inc/lang/it/lang.php
+++ b/inc/lang/it/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
  * italian language file
  *
diff --git a/inc/lang/ko/lang.php b/inc/lang/ko/lang.php
index 1fc4ee64327e1f7f4bb47bfe44d98f4f975ace14..704ae0c438590d732f1a0c613497f3f11aeec198 100644
--- a/inc/lang/ko/lang.php
+++ b/inc/lang/ko/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
  * korean language file
  *
diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php
index f562b686ea904e41bfe44bb84f3b6287e8311000..57ddd9ad421064d0d0f800eb79ce83ae965a72bc 100644
--- a/inc/lang/nl/lang.php
+++ b/inc/lang/nl/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
  * dutch language file
  *
diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php
index 418363bd2dd45953775f0dc2b422f7fa1a2a6b89..61b7c4297aa050b424688306bbc63698767be75c 100644
--- a/inc/lang/no/lang.php
+++ b/inc/lang/no/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
  * Norwegian language file
  *
diff --git a/inc/lang/pl/lang.php b/inc/lang/pl/lang.php
index e92eccd39c760fc248ad1567c0319aefacc808f8..dd730316fef77ac065f80bcab856974d1548bc91 100644
--- a/inc/lang/pl/lang.php
+++ b/inc/lang/pl/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
  * polish language file 
  * based on english one
diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php
index e9ef83b1f3ba3b8a05db48fe7bffffa2e60cee60..3c5486e794099978ee0987c0417277e02ea900a3 100644
--- a/inc/lang/pt-br/lang.php
+++ b/inc/lang/pt-br/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
  * Brazilian Portuguese language file
  *
diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php
index 305952cc9c84bbbb333134d77c58c549386891f1..57f69a353579a06b19249c690abbb8d88e3bd756 100644
--- a/inc/lang/pt/lang.php
+++ b/inc/lang/pt/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
  * Portuguese language file
  *
diff --git a/inc/lang/ro/lang.php b/inc/lang/ro/lang.php
index 220cd45711a9827f38eec193ffcad9c5b0c08200..9048d34d3a0037307b92f5f22d571d55f543b887 100644
--- a/inc/lang/ro/lang.php
+++ b/inc/lang/ro/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
  * romanian language file
  *
diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php
index e71314fde489243480e3e9980632baadb12f5cf1..72c71e70118a53e1d8547699115472cb6fae7a5e 100644
--- a/inc/lang/ru/lang.php
+++ b/inc/lang/ru/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
  * Russian language file
  *
diff --git a/inc/lang/sv/lang.php b/inc/lang/sv/lang.php
index 59e6d0d4c6333654f3fcb7688aafe9eeb378e621..fe6bf65a0df894b0e4d00068a5ed60b0ec46338e 100644
--- a/inc/lang/sv/lang.php
+++ b/inc/lang/sv/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
  * Swedish language file
  *
diff --git a/inc/lang/vi/lang.php b/inc/lang/vi/lang.php
index d064b9e31e4de26f58a141b9280e7c299d8fe553..a0c86c6086180290c6f5c85e971364094a6029e7 100644
--- a/inc/lang/vi/lang.php
+++ b/inc/lang/vi/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
  * vietnamese language file
  *
diff --git a/inc/lang/zh-tw/lang.php b/inc/lang/zh-tw/lang.php
index a2669f32bacd40a69ad498f76bfbf13c482de504..4cc36056e42efdef1b0f42206aca75970c21c8c5 100644
--- a/inc/lang/zh-tw/lang.php
+++ b/inc/lang/zh-tw/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
  * Chinese(Traditional) language file
  *
diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php
index f92078245898e9217c81badcd705425bec8de108..7709bca6f92ff513c708643233498fbc2c95057c 100644
--- a/inc/lang/zh/lang.php
+++ b/inc/lang/zh/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
  * Chinese(Simplified) language file
  *
diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php
index 28ad48f6f72abf66e584091c75a77268be2ec67b..e7dd3a7d11d4e5be2853f1a1019ccd828f70102a 100644
--- a/lib/tpl/default/main.php
+++ b/lib/tpl/default/main.php
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<?
+<?php
 /**
  * DokuWiki Default Template
  *
@@ -14,116 +14,116 @@
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 ?>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?=$conf['lang']?>"
- lang="<?=$conf['lang']?>" dir="<?=$lang['direction']?>">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang']?>"
+ lang="<?php echo $conf['lang']?>" dir="<?php echo $lang['direction']?>">
 <head>
-  <title><?=$ID?> [<?=hsc($conf['title'])?>]</title>
+  <title><?php echo $ID?> [<php echo hsc($conf['title'])?>]</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
-  <?tpl_metaheaders()?>
+  <?php tpl_metaheaders()?>
 
-  <link rel="shortcut icon" href="<?=DOKU_BASE?>lib/images/favicon.ico" />
-  <link rel="stylesheet" media="screen" type="text/css" href="<?=DOKU_TPL?>layout.css" />
-  <link rel="stylesheet" media="screen" type="text/css" href="<?=DOKU_TPL?>design.css" />
+  <link rel="shortcut icon" href="<?php echo DOKU_BASE?>lib/images/favicon.ico" />
+  <link rel="stylesheet" media="screen" type="text/css" href="<?php echo DOKU_TPL?>layout.css" />
+  <link rel="stylesheet" media="screen" type="text/css" href="<?php echo DOKU_TPL?>design.css" />
 
-  <? if($lang['direction'] == 'rtl') {?>
-  <link rel="stylesheet" media="screen" type="text/css" href="<?=DOKU_TPL?>rtl.css" />
-  <? } ?>
+  <?php if($lang['direction'] == 'rtl') {?>
+  <link rel="stylesheet" media="screen" type="text/css" href="<?php echo DOKU_TPL?>rtl.css" />
+  <?php } ?>
 
-  <link rel="stylesheet" media="print" type="text/css" href="<?=DOKU_TPL?>print.css" />
+  <link rel="stylesheet" media="print" type="text/css" href="<?php echo DOKU_TPL?>print.css" />
 
   <!--[if gte IE 5]>
   <style type="text/css">
     /* that IE 5+ conditional comment makes this only visible in IE 5+ */
     /* IE bugfix for transparent PNGs */
-    //DISABLED   img { behavior: url("<?=DOKU_BASE?>lib/scripts/pngbehavior.htc"); }
+    //DISABLED   img { behavior: url("<?php echo DOKU_BASE?>lib/scripts/pngbehavior.htc"); }
   </style>
   <![endif]-->
 
-  <?/*old includehook*/ @include(dirname(__FILE__).'/meta.html')?>
+  <?php /*old includehook*/ @include(dirname(__FILE__).'/meta.html')?>
 </head>
 
 <body>
-<?/*old includehook*/ @include(dirname(__FILE__).'/topheader.html')?>
+<?php /*old includehook*/ @include(dirname(__FILE__).'/topheader.html')?>
 <div class="dokuwiki">
-  <?html_msgarea()?>
+  <?php html_msgarea()?>
 
   <div class="stylehead">
 
     <div class="header">
       <div class="pagename">
-        [[<?tpl_link(wl($ID,'do=backlink'),$ID)?>]]
+        [[<?php tpl_link(wl($ID,'do=backlink'),$ID)?>]]
       </div>
       <div class="logo">
-        <?tpl_link(wl(),$conf['title'],'name="top" accesskey="h" title="[ALT+H]"')?>
+        <?php tpl_link(wl(),$conf['title'],'name="top" accesskey="h" title="[ALT+H]"')?>
       </div>
     </div>
   
-    <?/*old includehook*/ @include(dirname(__FILE__).'/header.html')?>
+    <?php /*old includehook*/ @include(dirname(__FILE__).'/header.html')?>
 
     <div class="bar" id="bar_top">
       <div class="bar-left" id="bar_topleft">
-        <?tpl_button('edit')?>
-        <?tpl_button('history')?>
+        <?php tpl_button('edit')?>
+        <?php tpl_button('history')?>
       </div>
   
       <div class="bar-right" id="bar_topright">
-        <?tpl_button('recent')?>
-        <?tpl_searchform()?>&nbsp;
+        <?php tpl_button('recent')?>
+        <?php tpl_searchform()?>&nbsp;
       </div>
     </div>
 
-    <?if($conf['breadcrumbs']){?>
+    <?php if($conf['breadcrumbs']){?>
     <div class="breadcrumbs">
-      <?tpl_breadcrumbs()?>
-      <?//tpl_youarehere() //(some people prefer this)?>
+      <?php tpl_breadcrumbs()?>
+      <?php //tpl_youarehere() //(some people prefer this)?>
     </div>
-    <?}?>
+    <?php }?>
 
   </div>
-  <?flush()?>
+  <?php flush()?>
 
-  <?/*old includehook*/ @include(dirname(__FILE__).'/pageheader.html')?>
+  <?php /*old includehook*/ @include(dirname(__FILE__).'/pageheader.html')?>
 
   <div class="page">
     <!-- wikipage start -->
-    <?tpl_content()?>
+    <?php tpl_content()?>
     <!-- wikipage stop -->
   </div>
 
   <div class="clearer">&nbsp;</div>
 
-  <?flush()?>
+  <?php flush()?>
 
   <div class="stylefoot">
 
     <div class="meta">
       <div class="user">
-        <?tpl_userinfo()?>
+        <?php tpl_userinfo()?>
       </div>
       <div class="doc">
-        <?tpl_pageinfo()?>
+        <?php tpl_pageinfo()?>
       </div>
     </div>
 
-   <?/*old includehook*/ @include(dirname(__FILE__).'/pagefooter.html')?>
+   <?php /*old includehook*/ @include(dirname(__FILE__).'/pagefooter.html')?>
 
     <div class="bar" id="bar_bottom">
       <div class="bar-left" id="bar_bottomleft">
-        <?tpl_button('edit')?>
-        <?tpl_button('history')?>
+        <?php tpl_button('edit')?>
+        <?php tpl_button('history')?>
       </div>
       <div class="bar-right" id="bar_bottomright">
-        <?tpl_button('admin')?>
-        <?tpl_button('login')?>
-        <?tpl_button('index')?>
-        <?tpl_button('top')?>&nbsp;
+        <?php tpl_button('admin')?>
+        <?php tpl_button('login')?>
+        <?php tpl_button('index')?>
+        <?php tpl_button('top')?>&nbsp;
       </div>
     </div>
 
   </div>
 
 </div>
-<?/*old includehook*/ @include(dirname(__FILE__).'/footer.html')?>
+<?php /*old includehook*/ @include(dirname(__FILE__).'/footer.html')?>
 </body>
 </html>
diff --git a/lib/tpl/default/media.php b/lib/tpl/default/media.php
index 507717463ec6a4a66c2b448540c57352de822ed9..d4417d5f6d5187148a4ade46362228e23ad0c342 100644
--- a/lib/tpl/default/media.php
+++ b/lib/tpl/default/media.php
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<?
+<?php
 /**
  * DokuWiki Default Template
  *
@@ -13,45 +13,45 @@
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 ?>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?=$conf['lang']?>" lang="<?=$conf['lang']?>" dir="ltr">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang']?>" lang="<?php echo $conf['lang']?>" dir="ltr">
 <head>
-  <title><?=hsc($lang['mediaselect'])?> [<?=hsc($conf['title'])?>]</title>
+  <title><?php echo hsc($lang['mediaselect'])?> [<?php echo hsc($conf['title'])?>]</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
-  <?tpl_metaheaders()?>
+  <?php tpl_metaheaders()?>
 
-  <link rel="shortcut icon" href="<?=DOKU_BASE?>lib/images/favicon.ico" />
-  <link rel="stylesheet" media="screen" type="text/css" href="<?=DOKU_TPL?>layout.css" />
-  <link rel="stylesheet" media="screen" type="text/css" href="<?=DOKU_TPL?>design.css" />
+  <link rel="shortcut icon" href="<?php echo DOKU_BASE?>lib/images/favicon.ico" />
+  <link rel="stylesheet" media="screen" type="text/css" href="<?php echo DOKU_TPL?>layout.css" />
+  <link rel="stylesheet" media="screen" type="text/css" href="<?php echo DOKU_TPL?>design.css" />
 
   <!--[if gte IE 5]>
   <style type="text/css">
     /* that IE 5+ conditional comment makes this only visible in IE 5+ */
     /* IE bugfix for transparent PNGs */
-    //DISABLED img { behavior: url("<?=DOKU_BASE?>lib/scripts/pngbehavior.htc"); }
+    //DISABLED img { behavior: url("<?php echo DOKU_BASE?>lib/scripts/pngbehavior.htc"); }
   </style>
   <![endif]-->
 </head>
 
 <body>
 <div class="dokuwiki">
-  <?html_msgarea()?>
+  <?php html_msgarea()?>
 
-  <h1><?=hsc($lang['mediaselect'])?> <code><?=hsc($NS)?></code></h1>
+  <h1><?php echo hsc($lang['mediaselect'])?> <code><?php echo hsc($NS)?></code></h1>
 
   <div class="mediaselect">
 
     <div class="mediaselect-left">
-      <b><a href="<?=DOKU_BASE?>/lib/exe/media.php?ns="><?=hsc($lang['namespaces'])?></a></b>
+      <b><a href="<?php echo DOKU_BASE?>/lib/exe/media.php?ns="><?php echo hsc($lang['namespaces'])?></a></b>
 
-			<?tpl_medianamespaces()?>
+			<?php tpl_medianamespaces()?>
 		</div>
 
     <div class="mediaselect-right">
-      <?tpl_mediafilelist()?>
+      <?php tpl_mediafilelist()?>
 
 			<div class="uploadform">
-			<?tpl_mediauploadform()?>
+			<?php tpl_mediauploadform()?>
 			</div>
 		</div>