diff --git a/.htaccess.dist b/.htaccess.dist
index 54ad4b5898b654215957faa555915657b18d4ff0..aa2437b957ec2d17d6502214ba2ba5e708ecb476 100644
--- a/.htaccess.dist
+++ b/.htaccess.dist
@@ -4,8 +4,8 @@
 ## global config. Symlinks maybe needed for URL rewriting.
 #Options -Indexes -MultiViews +FollowSymLinks
 
-## make sure nobody gets the htaccess files
-<Files ~ "^[\._]ht">
+## make sure nobody gets the htaccess, README, COPYING or VERSION files
+<Files ~ "^([\._]ht|README$|VERSION$|COPYING$)">
     Order allow,deny
     Deny from all
     Satisfy All
diff --git a/inc/infoutils.php b/inc/infoutils.php
index 096662d2437b6126e70f97eb0387da128aa5cf4d..87b29d7af74c127e30a01bc4a57820ab18fcb10b 100644
--- a/inc/infoutils.php
+++ b/inc/infoutils.php
@@ -100,7 +100,9 @@ function check(){
     global $conf;
     global $INFO;
 
-    msg('DokuWiki version: '.getVersion(),1);
+    if ($INFO['isadmin'] || $INFO['ismanager']){
+        msg('DokuWiki version: '.getVersion(),1);
+    }
 
     if(version_compare(phpversion(),'5.1.2','<')){
         msg('Your PHP version is too old ('.phpversion().' vs. 5.1.2+ needed)',-1);
diff --git a/inc/template.php b/inc/template.php
index 8847f788d05250b14dd19a785c4d5b8d5e6de652..4d24c2191bd95e78895ccebff48af911f43f3ead 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -255,7 +255,7 @@ function tpl_metaheaders($alt=true){
     }
 
     // the usual stuff
-    $head['meta'][] = array( 'name'=>'generator', 'content'=>'DokuWiki '.getVersion() );
+    $head['meta'][] = array( 'name'=>'generator', 'content'=>'DokuWiki');
     $head['link'][] = array( 'rel'=>'search', 'type'=>'application/opensearchdescription+xml',
             'href'=>DOKU_BASE.'lib/exe/opensearch.php', 'title'=>$conf['title'] );
     $head['link'][] = array( 'rel'=>'start', 'href'=>DOKU_BASE );