diff --git a/docs/NEWS b/docs/NEWS
index 450120b1..72bc5947 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -1,8 +1,10 @@
 #
 
-Version 2.0-beta4/5 / RC? ()
+Version 2.0-beta4/5/6 / RC? ()
 ------------------------------------------------------------------------
 
+    * Added new PAT_JS mod_rewrite rule to .htaccess files
+    
     * Smarty 3.1.21 upgrade (see changelog)
 
     * Fix issue #220 with pdf directory moving rename() error
diff --git a/include/admin/upgrader.inc.php b/include/admin/upgrader.inc.php
index 61dc0126..2b45e302 100644
--- a/include/admin/upgrader.inc.php
+++ b/include/admin/upgrader.inc.php
@@ -235,6 +235,10 @@ $tasks = array(array('version'   => '0.5.1',
                      'arguments' => array('serendipity_event_dashboard'),
                      'title'     => 'Remove dashboard plugin',
                      'desc'      => 'Serendipity 2.0 includes a dashboard in the admin theme. The separate plugin for 1.x has to be removed.'),
+               array('version'   => '2.0-beta6',
+                     'function'  => 'serendipity_installFiles',
+                     'title'     => 'Update of .htaccess file',
+                     'desc'      => 'Changes were made to the .htaccess file to allow for new patterns, it will be recreated. If you manually modified the file, make sure your modification are in place afterwards.'),
 
 );
 
diff --git a/include/functions_installer.inc.php b/include/functions_installer.inc.php
index a55060db..654d1d01 100644
--- a/include/functions_installer.inc.php
+++ b/include/functions_installer.inc.php
@@ -758,6 +758,7 @@ function serendipity_installFiles($serendipity_core = '') {
                    '{PAT_SEARCH}', '{PATH_SEARCH}',
                    '{PAT_COMMENTS}', '{PATH_COMMENTS}',
                    '{PAT_CSS}',
+                   '{PAT_JS}',
                    '{PAT_PERMALINK}',
                    '{PAT_PERMALINK_AUTHORS}',
                    '{PAT_PERMALINK_FEEDCATEGORIES}',
@@ -780,6 +781,7 @@ function serendipity_installFiles($serendipity_core = '') {
                    trim($PAT['SEARCH'], '@/i'),      $serendipity['permalinkSearchPath'],
                    trim($PAT['COMMENTS'], '@/i'),    $serendipity['permalinkCommentsPath'],
                    trim(PAT_CSS, '@/i'),
+                   trim(PAT_JS, '@/i'),
                    trim($PAT['PERMALINK'], '@/i'),
                    trim($PAT['PERMALINK_AUTHORS'], '@/i'),
                    trim($PAT['PERMALINK_FEEDCATEGORIES'], '@/i'),
diff --git a/include/tpl/htaccess_cgi_rewrite.tpl b/include/tpl/htaccess_cgi_rewrite.tpl
index 81d25aa1..243efe74 100644
--- a/include/tpl/htaccess_cgi_rewrite.tpl
+++ b/include/tpl/htaccess_cgi_rewrite.tpl
@@ -24,6 +24,7 @@ RewriteRule ^{PAT_PLUGIN} {indexFile}?url=$1/$2 [L,QSA]
 RewriteRule ^{PAT_SEARCH} {indexFile}?url=/{PATH_SEARCH}/$1 [L,QSA]
 RewriteRule ^{PAT_COMMENTS} {indexFile}?url=/{PATH_COMMENTS}/$1 [L,QSA]
 RewriteRule ^{PAT_CSS}$ {indexFile}?url=/$1 [L,QSA]
+RewriteRule ^{PAT_JS}$ {indexFile}?url=/$1 [L,QSA]
 RewriteRule ^index\.(html?|php.+) {indexFile}?url=index.html [L,QSA]
 RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA]
 #RewriteCond %{REQUEST_URI} !-U
diff --git a/include/tpl/htaccess_cgi_rewrite2.tpl b/include/tpl/htaccess_cgi_rewrite2.tpl
index 08403452..8d54f2b8 100644
--- a/include/tpl/htaccess_cgi_rewrite2.tpl
+++ b/include/tpl/htaccess_cgi_rewrite2.tpl
@@ -24,6 +24,7 @@ RewriteRule ^{PAT_PLUGIN} {indexFile}?url=$1/$2 [L,QSA]
 RewriteRule ^{PAT_SEARCH} {indexFile}?url=/{PATH_SEARCH}/$1 [L,QSA]
 RewriteRule ^{PAT_COMMENTS} {indexFile}?url=/{PATH_COMMENTS}/$1 [L,QSA]
 RewriteRule ^{PAT_CSS} {indexFile}?url=/$1 [L,QSA]
+RewriteRule ^{PAT_JS}$ {indexFile}?url=/$1 [L,QSA] 
 RewriteRule ^index\.(html?|php.+) {indexFile}?url=index.html [L,QSA]
 RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA]
 #RewriteCond %{REQUEST_URI} !-U
diff --git a/include/tpl/htaccess_rewrite.tpl b/include/tpl/htaccess_rewrite.tpl
index 537dbb2b..25dd0439 100644
--- a/include/tpl/htaccess_rewrite.tpl
+++ b/include/tpl/htaccess_rewrite.tpl
@@ -26,6 +26,7 @@ RewriteRule ^{PAT_PLUGIN} {indexFile}?url=$1/$2 [L,QSA]
 RewriteRule ^{PAT_SEARCH} {indexFile}?url=/{PATH_SEARCH}/$1 [L,QSA]
 RewriteRule ^{PAT_COMMENTS} {indexFile}?url=/{PATH_COMMENTS}/$1 [L,QSA]
 RewriteRule ^{PAT_CSS}$ {indexFile}?url=/$1 [L,QSA]
+RewriteRule ^{PAT_JS}$ {indexFile}?url=/$1 [L,QSA] 
 RewriteRule ^index\.(html?|php.+) {indexFile}?url=index.html [L,QSA]
 RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA]
 #RewriteCond %{REQUEST_URI} !-U
diff --git a/include/tpl/htaccess_rewrite2.tpl b/include/tpl/htaccess_rewrite2.tpl
index cfe65c95..77b39953 100644
--- a/include/tpl/htaccess_rewrite2.tpl
+++ b/include/tpl/htaccess_rewrite2.tpl
@@ -26,6 +26,7 @@ RewriteRule ^{PAT_PLUGIN} {indexFile}?url=$1/$2 [L,QSA]
 RewriteRule ^{PAT_SEARCH} {indexFile}?url=/{PATH_SEARCH}/$1 [L,QSA]
 RewriteRule ^{PAT_COMMENTS} {indexFile}?url=/{PATH_COMMENTS}/$1 [L,QSA]
 RewriteRule ^{PAT_CSS} {indexFile}?url=/$1 [L,QSA]
+RewriteRule ^{PAT_JS}$ {indexFile}?url=/$1 [L,QSA] 
 RewriteRule ^index\.(html?|php.+) {indexFile}?url=index.html [L,QSA]
 RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA]
 #RewriteCond %{REQUEST_URI} !-U
diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php
index 45bcfbe9..e451fc6c 100644
--- a/serendipity_config.inc.php
+++ b/serendipity_config.inc.php
@@ -44,7 +44,7 @@ if (defined('USE_MEMSNAP')) {
 }
 
 // The version string
-$serendipity['version']         = '2.0-beta5';
+$serendipity['version']         = '2.0-beta6';
 
 
 // Setting this to 'false' will enable debugging output. All alpha/beta/cvs snapshot versions will emit debug information by default. To increase the debug level (to enable Smarty debugging), set this flag to 'debug'.