diff --git a/.htaccess b/.htaccess
index e5c5c191..69ec321e 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,4 +1,3 @@
-Allow From All
 Options -Indexes -MultiViews
 
 ErrorDocument 403 /www/error403.html
@@ -6,25 +5,39 @@ ErrorDocument 404 /www/error404.html
 ErrorDocument 500 /www/error500.html
 
 
-<Files ~ "\.inc$">
-	Order Deny,Allow
-	Deny From All
-</Files>
-
-<Files ~ "\.tpl$">
-	Order Deny,Allow
-	Deny From All
-</Files>
-
-<Files ~ "\.log$">
-	Order Deny,Allow
-	Deny From All
-</Files>
+<IfModule mod_authz_core.c>
+	Require all granted
+	
+	<Files ~ "\.inc$">
+		Require all denied
+	</Files>
+	<Files ~ "\.tpl$">
+		Require all denied
+	</Files>
+	<Files ~ "\.log$">
+		Require all denied
+	</Files>
+</IfModule>
+<IfModule !mod_authz_core.c>
+	Allow From All
+	
+	<Files ~ "\.inc$">
+		Order Deny,Allow
+		Deny From All
+	</Files>
+	<Files ~ "\.tpl$">
+		Order Deny,Allow
+		Deny From All
+	</Files>
+	<Files ~ "\.log$">
+		Order Deny,Allow
+		Deny From All
+	</Files>
+</IfModule>
 
 
 <IfModule mod_rewrite.c>
 	RewriteEngine On
 	
-	RewriteBase	/
-	RewriteRule	^(.*)$	www/$1 [L]
+	RewriteRule	^(.*)$	www/$1 [QSA,N]
 </IfModule>
diff --git a/www/.htaccess b/www/.htaccess
index 63163a80..29a1faa5 100644
--- a/www/.htaccess
+++ b/www/.htaccess
@@ -1,7 +1,6 @@
 <IfModule mod_rewrite.c>
 	RewriteEngine On
 	
-	RewriteBase	/
 	RewriteCond	%{REQUEST_FILENAME}	!-d
 	RewriteCond	%{REQUEST_FILENAME}	!-f
 	RewriteRule	^(.*)$			index.php?url=$1 [QSA,L,NE]