diff --git .htaccess .htaccess
index 75ebf05..2e84416 100644
--- .htaccess
+++ .htaccess
@@ -85,7 +85,8 @@ DirectoryIndex index.php
   RewriteCond %{REQUEST_FILENAME} !-f
   RewriteCond %{REQUEST_FILENAME} !-d
   RewriteCond %{REQUEST_URI} !=/favicon.ico
-  RewriteRule ^(.*)$ index.php?q=$1 [L,QSA]
+  RewriteCond %{THE_REQUEST} ^[^\/]+\/([^?]*)\??(.*)\s+HTTP.+$
+  RewriteRule ^.*$ /index.php?q=%1 [L,QSA,NE]
 </IfModule>
 
 # $Id: .htaccess,v 1.98 2008/11/28 09:39:13 dries Exp $