Index: modules/system/system.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.test,v
retrieving revision 1.145
diff -u -p -r1.145 system.test
--- modules/system/system.test	1 Oct 2010 18:37:23 -0000	1.145
+++ modules/system/system.test	4 Oct 2010 21:28:22 -0000
@@ -1546,7 +1546,7 @@ class TokenReplaceTestCase extends Drupa
     $tests['[site:slogan]'] = check_plain(variable_get('site_slogan', ''));
     $tests['[site:mail]'] = 'simpletest@example.com';
     $tests['[site:url]'] = url('<front>', $url_options);
-    $tests['[site:url-brief]'] = preg_replace('!^https?://!', '', url('<front>', $url_options));
+    $tests['[site:url-brief]'] = preg_replace(array('!^https?://!', '!/$!'), '', url('<front>', $url_options));
     $tests['[site:login-url]'] = url('user', $url_options);
 
     // Test to make sure that we generated something for each token.
Index: modules/system/system.tokens.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.tokens.inc,v
retrieving revision 1.12
diff -u -p -r1.12 system.tokens.inc
--- modules/system/system.tokens.inc	17 Aug 2010 21:31:13 -0000	1.12
+++ modules/system/system.tokens.inc	4 Oct 2010 21:28:22 -0000
@@ -165,7 +165,7 @@ function system_tokens($type, $tokens, a
           break;
 
         case 'url-brief':
-          $replacements[$original] = preg_replace('!^https?://!', '', url('<front>', $url_options));
+          $replacements[$original] = preg_replace(array('!^https?://!', '!/$!'), '', url('<front>', $url_options));
           break;
 
         case 'login-url':